Revision: 5723
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5723&view=rev
Author:   hofman
Date:     2009-09-09 09:34:11 +0000 (Wed, 09 Sep 2009)

Log Message:
-----------
gate first non-empty page for a selection rather than just the first page

Modified Paths:
--------------
    trunk/PDFSelection_SKExtensions.m

Modified: trunk/PDFSelection_SKExtensions.m
===================================================================
--- trunk/PDFSelection_SKExtensions.m   2009-09-08 23:41:42 UTC (rev 5722)
+++ trunk/PDFSelection_SKExtensions.m   2009-09-09 09:34:11 UTC (rev 5723)
@@ -59,8 +59,7 @@
 
 // returns the label of the first page (if the selection spans multiple pages)
 - (NSString *)firstPageLabel { 
-    NSArray *pages = [self pages];
-    return [pages count] ? [[pages objectAtIndex:0] displayLabel] : nil;
+    return [[self safeFirstPage] displayLabel];
 }
 
 - (NSString *)cleanedString {
@@ -113,9 +112,8 @@
 
 - (PDFDestination *)destination {
     PDFDestination *destination = nil;
-    NSArray *pages = [self pages];
-    if ([pages count]) {
-        PDFPage *page = [pages objectAtIndex:0];
+    PDFPage *page = [self safeFirstPage];
+    if (page) {
         NSRect bounds = [self boundsForPage:page];
         destination = [[[PDFDestination alloc] initWithPage:page 
atPoint:NSMakePoint(NSMinX(bounds), NSMaxY(bounds))] autorelease];
     }
@@ -179,6 +177,64 @@
     return nil;
 }
 
+- (PDFPage *)safeFirstPage {
+    if ([self respondsToSelector:@selector(indexOfCharactersOnPage:)]) {
+        NSEnumerator *pageEnum = [[self pages] objectEnumerator];
+        PDFPage *page;
+        while (page = [pageEnum nextObject]) {
+            if ([[self indexOfCharactersOnPage:page] firstIndex] != NSNotFound)
+                return page;
+        }
+    } else if ([self respondsToSelector:@selector(numberOfRangesOnPage:)] && 
[self respondsToSelector:@selector(rangeAtIndex:onPage:)]) {
+        NSEnumerator *pageEnum = [[self pages] objectEnumerator];
+        PDFPage *page;
+        while (page = [pageEnum nextObject]) {
+            NSInteger i, count = [self numberOfRangesOnPage:page];
+            for (i = 0; i < count; i++) {
+                if ([self rangeAtIndex:i onPage:page].length > 0)
+                    return page;
+            }
+        }
+    } else {
+        NSEnumerator *pageEnum = [[self pages] objectEnumerator];
+        PDFPage *page;
+        while (page = [pageEnum nextObject]) {
+            if (NSIsEmptyRect([self boundsForPage:page]) == NO)
+                return page;
+        }
+    }
+    return nil;
+}
+
+- (PDFPage *)safeLastPage {
+    if ([self respondsToSelector:@selector(indexOfCharactersOnPage:)]) {
+        NSEnumerator *pageEnum = [[self pages] reverseObjectEnumerator];
+        PDFPage *page;
+        while (page = [pageEnum nextObject]) {
+            if ([[self indexOfCharactersOnPage:page] firstIndex] != NSNotFound)
+                return page;
+        }
+    } else if ([self respondsToSelector:@selector(numberOfRangesOnPage:)] && 
[self respondsToSelector:@selector(rangeAtIndex:onPage:)]) {
+        NSEnumerator *pageEnum = [[self pages] reverseObjectEnumerator];
+        PDFPage *page;
+        while (page = [pageEnum nextObject]) {
+            NSInteger i, count = [self numberOfRangesOnPage:page];
+            for (i = 0; i < count; i++) {
+                if ([self rangeAtIndex:i onPage:page].length > 0)
+                    return page;
+            }
+        }
+    } else {
+        NSEnumerator *pageEnum = [[self pages] reverseObjectEnumerator];
+        PDFPage *page;
+        while (page = [pageEnum nextObject]) {
+            if (NSIsEmptyRect([self boundsForPage:page]) == NO)
+                return page;
+        }
+    }
+    return nil;
+}
+
 - (BOOL)hasCharacters {
     if ([self respondsToSelector:@selector(indexOfCharactersOnPage:)]) {
         NSEnumerator *pageEnum = [[self pages] objectEnumerator];


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to