Revision: 2498 http://skim-app.svn.sourceforge.net/skim-app/?rev=2498&view=rev Author: hofman Date: 2007-07-13 12:15:55 -0700 (Fri, 13 Jul 2007)
Log Message: ----------- Interchange replacing %line and replacing %file in pdfsync command. Modified Paths: -------------- trunk/SKDocument.m Modified: trunk/SKDocument.m =================================================================== --- trunk/SKDocument.m 2007-07-13 18:28:07 UTC (rev 2497) +++ trunk/SKDocument.m 2007-07-13 19:15:55 UTC (rev 2498) @@ -880,25 +880,25 @@ NSRange range = NSMakeRange(0, 0); unichar prevChar, nextChar; while (NSMaxRange(range) < [cmdString length]) { - range = [cmdString rangeOfString:@"%file" options:NSLiteralSearch range:NSMakeRange(NSMaxRange(range), [cmdString length] - NSMaxRange(range))]; + range = [cmdString rangeOfString:@"%line" options:NSLiteralSearch range:NSMakeRange(NSMaxRange(range), [cmdString length] - NSMaxRange(range))]; if (range.location == NSNotFound) break; - prevChar = range.location > 0 ? [cmdString characterAtIndex:range.location - 1] : 0; nextChar = NSMaxRange(range) < [cmdString length] ? [cmdString characterAtIndex:NSMaxRange(range)] : 0; - if (prevChar == '\'' && nextChar == '\'') - [cmdString replaceCharactersInRange:range withString:file]; - else if ([[NSCharacterSet letterCharacterSet] characterIsMember:nextChar] == NO) - [cmdString replaceCharactersInRange:range withString:[file stringByEscapingShellChars]]; + if ([[NSCharacterSet letterCharacterSet] characterIsMember:nextChar] == NO) + [cmdString replaceCharactersInRange:range withString:[NSString stringWithFormat:@"%d", line]]; } range = NSMakeRange(0, 0); while (NSMaxRange(range) < [cmdString length]) { - range = [cmdString rangeOfString:@"%line" options:NSLiteralSearch range:NSMakeRange(NSMaxRange(range), [cmdString length] - NSMaxRange(range))]; + range = [cmdString rangeOfString:@"%file" options:NSLiteralSearch range:NSMakeRange(NSMaxRange(range), [cmdString length] - NSMaxRange(range))]; if (range.location == NSNotFound) break; + prevChar = range.location > 0 ? [cmdString characterAtIndex:range.location - 1] : 0; nextChar = NSMaxRange(range) < [cmdString length] ? [cmdString characterAtIndex:NSMaxRange(range)] : 0; - if ([[NSCharacterSet letterCharacterSet] characterIsMember:nextChar] == NO) - [cmdString replaceCharactersInRange:range withString:[NSString stringWithFormat:@"%d", line]]; + if (prevChar == '\'' && nextChar == '\'') + [cmdString replaceCharactersInRange:range withString:file]; + else if ([[NSCharacterSet letterCharacterSet] characterIsMember:nextChar] == NO) + [cmdString replaceCharactersInRange:range withString:[file stringByEscapingShellChars]]; } [cmdString insertString:@"\" " atIndex:0]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit