Revision: 13310 http://sourceforge.net/p/skim-app/code/13310 Author: hofman Date: 2023-02-26 16:40:01 +0000 (Sun, 26 Feb 2023) Log Message: ----------- interpret Squiggly notes as underline
Modified Paths: -------------- trunk/SkimNotes/PDFAnnotation_SKNExtensions.m Modified: trunk/SkimNotes/PDFAnnotation_SKNExtensions.m =================================================================== --- trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2023-02-26 10:06:26 UTC (rev 13309) +++ trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2023-02-26 16:40:01 UTC (rev 13310) @@ -126,6 +126,8 @@ NSString *SKNPDFAnnotationWidgetTypeKey = @"widgetType"; NSString *SKNPDFAnnotationFieldNameKey = @"fieldName"; +#define SKNSquigglyString @"Squiggly" + #if defined(PDFKIT_PLATFORM_IOS) static inline UIColor *SKNColorFromArray(NSArray *array) { @@ -225,7 +227,7 @@ return [PDFAnnotationCircle class]; else if ([type isEqualToString:SKNSquareString]) return [PDFAnnotationSquare class]; - else if ([type isEqualToString:SKNHighlightString] || [type isEqualToString:SKNMarkUpString] || [type isEqualToString:SKNUnderlineString] || [type isEqualToString:SKNStrikeOutString]) + else if ([type isEqualToString:SKNHighlightString] || [type isEqualToString:SKNMarkUpString] || [type isEqualToString:SKNUnderlineString] || [type isEqualToString:SKNStrikeOutString] || [type isEqualToString:SKNSquigglyString]) return [PDFAnnotationMarkup class]; else if ([type isEqualToString:SKNLineString]) return [PDFAnnotationLine class]; @@ -281,7 +283,7 @@ if ([[self class] isSubclassOfClass:[PDFAnnotationMarkup class]]) { #pragma clang diagnostic pop NSInteger markupType = kPDFMarkupTypeHighlight; - if ([type isEqualToString:SKNUnderlineString]) + if ([type isEqualToString:SKNUnderlineString] || [type isEqualToString:SKNSquigglyString]) markupType = kPDFMarkupTypeUnderline; else if ([type isEqualToString:SKNStrikeOutString]) markupType = kPDFMarkupTypeStrikeOut; @@ -432,7 +434,7 @@ [self setAlignment:[alignment integerValue]]; } - if ([type isEqualToString:SKNHighlightString] || [type isEqualToString:SKNMarkUpString] || [type isEqualToString:SKNUnderlineString] || [type isEqualToString:SKNStrikeOutString]) { + if ([type isEqualToString:SKNHighlightString] || [type isEqualToString:SKNMarkUpString] || [type isEqualToString:SKNUnderlineString] || [type isEqualToString:SKNStrikeOutString] || [type isEqualToString:SKNSquigglyString]) { NSArray *pointStrings = [dict objectForKey:SKNPDFAnnotationQuadrilateralPointsKey]; NSMutableArray *pointValues = [[NSMutableArray alloc] initWithCapacity:[pointStrings count]]; NSUInteger i, iMax = [pointStrings count]; @@ -647,7 +649,7 @@ } } - if ([type isEqualToString:SKNHighlightString] || [type isEqualToString:SKNMarkUpString] || [type isEqualToString:SKNUnderlineString] || [type isEqualToString:SKNStrikeOutString]) { + if ([type isEqualToString:SKNHighlightString] || [type isEqualToString:SKNMarkUpString] || [type isEqualToString:SKNUnderlineString] || [type isEqualToString:SKNStrikeOutString] || [type isEqualToString:SKNSquigglyString]) { if ([self respondsToSelector:@selector(quadrilateralPoints)]) { NSArray *quadPoints = [(id)self quadrilateralPoints]; if (quadPoints) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit