20151123

- Updated touch event handling.
- Overlay views, drawable and touchables accept coordinates in both PDF page and UI space.
- Minor tweaks and improvements

Classes/Reader/ReaderViewController.m

@@ -541,9 +541,10 @@ -(void)handleSearchGotCancelledNotification:(NSNotification *)notification {
 -(void)handleSearchUpdateNotification:(NSNotification *)notification {
 
     NSDictionary * userInfo = notification.userInfo;
-    NSUInteger page = [userInfo[kNotificationSearchInfoPage] unsignedIntegerValue];
+    NSInteger page = [userInfo[kNotificationSearchInfoPage] integerValue];
+    NSInteger delta = page - self.page;
 
-    if(self.isViewLoaded && (fabs(page - self.page) < 2)) {
+    if(self.isViewLoaded && (delta < 2)) {
         // We get up to two false 'current' page positives but it is good enogh for now.
         [self reloadOverlay];
     }

Classes/SimpleApp/Controllers/Drawable.m

@@ -14,18 +14,14 @@ @implementation Drawable
 -(CFDictionaryRef)fontAttributes {
     if(!_fontAttributes) {
 
-        CFStringRef fontName = CFStringCreateWithCString(NULL, "Helvetica-Neue", kCFStringEncodingMacRoman);
-
-        CTFontRef font = CTFontCreateWithName(fontName, 12.0, NULL);
+        CTFontRef font = CTFontCreateWithName((CFStringRef)@"Helvetica-Neue", 12.0, NULL);
 
         CFStringRef keys[] = { kCTFontAttributeName };
 
         CFTypeRef values[] = { font };
 
         _fontAttributes = CFDictionaryCreate(kCFAllocatorDefault, (const void **)&keys, (const void **)&values, sizeof(keys) / sizeof(keys[0]), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
 
-        CFRelease(fontName);
-
         CFRelease(font);
     }
     return _fontAttributes;
@@ -60,12 +56,8 @@ -(void)drawInContext:(CGContextRef)context{
 
     CGRect clipBoundingBox = CGContextGetClipBoundingBox(context);
 
-    CGContextTranslateCTM(context, 0, clipBoundingBox.size.height);
-    CGContextScaleCTM(context, 1.0, -1.0);
-
     const char *text = "Hello World!";
 
-
     CGContextSetTextPosition(context, 101, 113);
     CTLineDraw([self firstLine], context);
 

FPKCore/FPKOverlayViewDataSource.h

@@ -14,19 +14,32 @@
 @optional
 
 /**
- This method shall return a set of view to display over the pdf page.
+ Returns an array of UIView to be displayed as overlay on the PDF page view.
  */
 -(NSArray *)documentViewController:(MFDocumentViewController *)dvc overlayViewsForPage:(NSUInteger)page;
 
 /**
- This method needs to return the frame in page-coordinates for the view passed as arguments. Remember that, like drawables
- and touchables, the coordinate system's origin is in the bottom left corner of the page.
+ Return the frame of the overlay view in the page view. 
+ 
+ Remember that the
+ CGRect returned must be in PDF Coordinate System, that is with the origin in the
+ lower left.
  */
 -(CGRect)documentViewController:(MFDocumentViewController *)dvc rectForOverlayView:(UIView *)view onPage:(NSUInteger)page;
 
 /**
- These callbacks will be invoked when the overlay view is going to be added, after is added, when is going to be removed
- and when it is actually removed from the page view. Use these to change the status of the view and or start/stop any
+ Return the frame of the overlay view int the page view. 
+ 
+ Note that, as opposed to
+ documentViewController:frameForOverlayView:onPage: the CGRect returned is in
+ UIView coordinate space, that is with the origin in the upper left.
+ */
+-(CGRect)documentViewController:(MFDocumentViewController *)dvc frameForOverlayView:(UIView *)view onPage:(NSUInteger)page;
+
+/**
+ These callbacks will be invoked when the overlay view is going to be added, 
+ after is added, when is going to be removed and when it is actually removed from 
+ the page view. Use these to change the status of the view and or start/stop any
  action that needs to be synchronized with the lifecycle of the view.
  */
 -(void)documentViewController:(MFDocumentViewController *)dvc willAddOverlayView:(UIView *)view;
@@ -44,7 +57,7 @@
 
 /**
  This method is called when the Overlay View have been removed
- 
+
  */
 -(void)documentViewController:(MFDocumentViewController *)dvc didRemoveOverlayView:(UIView *)view;
 

FPKCore/MFDocumentManager.h

@@ -145,27 +145,40 @@ Convert a CGRect from iOS view space to a PDF page coordinate space.
  */
 -(void)emptyCache;
 
-/**
- * Return an array of MFTextItem representing the matches of teh search term on 
- * the page passed as arguments. It is a good idea running this method in a 
- * secondary thread.
- *
- * mode is of type FPKSearchMode and has the following values:
- * FPKSearchModeHard - if you search for 'bèzier' it will match 'bèzier' only 
- * but not 'bezier'. If you search for 'bezier' it will match 'bezier' only.
- * FPKSearchModeSoft - if you search for term 'bèzier' it will match both 
- * 'bezier' and 'bèzier'. Same if you search for 'bezier'.
- * FPKSearchModeSmart - if you search for term 'bezier', it will also match 
- * 'bèzier', but if you search for 'bèzier' it will match 'bèzier' only.
- *
- * ignoreOrNot tell the function if it should ignore case or not.
- *
- * exactMatchOrNot tell the function if it should match the term as a whole or 
- * search for each component separated by spaces.
- *
- * Default parameters are FPKSearchModeSmart, ignoreCase to YES and exactMatch 
- * to NO.
+/*!
+ Return an array of MFTextItem representing the matches of teh search term on
+ the page passed as arguments. It is a good idea running this method in a
+ secondary thread.
+ 
+ @param mode is of type FPKSearchMode and has the following values:
+ FPKSearchModeHard - if you search for 'bèzier' it will match 'bèzier' only
+ but not 'bezier'. If you search for 'bezier' it will match 'bezier' only.
+ FPKSearchModeSoft - if you search for term 'bèzier' it will match both
+ 'bezier' and 'bèzier'. Same if you search for 'bezier'.
+ FPKSearchModeSmart - if you search for term 'bezier', it will also match
+ 'bèzier', but if you search for 'bèzier' it will match 'bèzier' only.
+ 
+ @param ignoreOrNot tell the function if it should ignore case or not.
+ 
+ @param exactMatchOrNot tell the function if it should match the term as a whole or
+ search for each component separated by spaces.
+ 
+ @param pdfCoordinates If set to YES, the coordinates of the MFTextItem will be
+ in PDF Coordinate System (origin on the lower left). If set to NO the coordinates
+ will be in UI interface space, that is origin on the upper left.
+ 
+ Default parameters are FPKSearchModeSmart, ignoreCase to YES, exactMatch
+ to NO and pdfCoordinates to YES.
+ 
+ @return NSArray An array of MFTextItem or nil if no match is found.
  */
+-(NSArray *)searchResultOnPage:(NSUInteger)pageNr
+                forSearchTerms:(NSString *)searchTerm
+                          mode:(FPKSearchMode)mode
+                    ignoreCase:(BOOL)ignoreOrNot
+                    exactMatch:(BOOL)exactMatchOrNot
+                pdfCoordinates:(BOOL)pdfCoordinates;
+
 -(NSArray *)searchResultOnPage:(NSUInteger)pageNr 
                 forSearchTerms:(NSString *)searchTerm 
                           mode:(FPKSearchMode)mode