Revision: 10973
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=10973&view=rev
Author: hofman
Date: 2007-08-23 11:37:10 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
Remove all newlines and collapse whitespace from string values returned from
btparse. Btparse does this only for the newline character \n, but as we should
treat all newline characters equivalently, this should also be done for
carriage return.
Modified Paths:
--------------
trunk/bibdesk/BibTeXParser.m
Modified: trunk/bibdesk/BibTeXParser.m
===================================================================
--- trunk/bibdesk/BibTeXParser.m 2007-08-23 14:20:10 UTC (rev 10972)
+++ trunk/bibdesk/BibTeXParser.m 2007-08-23 18:37:10 UTC (rev 10973)
@@ -47,6 +47,7 @@
#import "BDSKComplexString.h"
#import "BibPrefController.h"
#import "BibDocument_Groups.h"
+#import "CFString_BDSKExtensions.h"
#import "NSString_BDSKExtensions.h"
#import "BibAuthor.h"
#import "BDSKErrorObjectController.h"
@@ -624,11 +625,12 @@
static inline NSString *copyCheckedString(const char *cstring, int line,
NSString *filePath, NSStringEncoding parserEncoding){
NSString *nsString = cstring ? [[NSString alloc] initWithCString:cstring
encoding:parserEncoding] : nil;
- if (nsString && checkStringForEncoding(nsString, line, filePath,
parserEncoding) == NO) {
- [nsString release];
- nsString = nil;
- }
- return nsString;
+ NSString *returnString = nil;
+ if (nsString && checkStringForEncoding(nsString, line, filePath,
parserEncoding))
+ // btparse does this, but only for \n, as the lex parser does not
recognize it as a newline character
+ returnString = (NSString
*)BDStringCreateByCollapsingAndTrimmingWhitespaceAndNewlines(CFAllocatorGetDefault(),
(CFStringRef)nsString);
+ [nsString release];
+ return returnString;
}
static NSString *copyStringFromBTField(AST *field, NSString *filePath,
BDSKMacroResolver *macroResolver, NSStringEncoding parserEncoding){
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: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
