Revision: 18625
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18625&view=rev
Author: ununnilium
Date: 2012-05-14 13:57:52 +0000 (Mon, 14 May 2012)
Log Message:
-----------
Merge revisions 18547:18623 from trunk/bibdesk to trunk/bibdesk_ios/bibdesk
Modified Paths:
--------------
trunk/bibdesk_ios/bibdesk/BDSKTableSortDescriptor.m
trunk/bibdesk_ios/bibdesk/BDSKWebOfScienceParser.m
trunk/bibdesk_ios/bibdesk/BibDocument.m
trunk/bibdesk_ios/bibdesk/BibDocument_Actions.m
trunk/bibdesk_ios/bibdesk/Bibdesk.xcodeproj/project.pbxproj
trunk/bibdesk_ios/bibdesk/DeveloperDocumentation/HowtoRelease.txt
trunk/bibdesk_ios/bibdesk/English.lproj/BibDeskHelp/version.texi
trunk/bibdesk_ios/bibdesk/Info.plist
trunk/bibdesk_ios/bibdesk/RelNotes.rtf
Property Changed:
----------------
trunk/bibdesk_ios/bibdesk/
Property changes on: trunk/bibdesk_ios/bibdesk
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/bibdesk:18548-18623
Modified: trunk/bibdesk_ios/bibdesk/BDSKTableSortDescriptor.m
===================================================================
--- trunk/bibdesk_ios/bibdesk/BDSKTableSortDescriptor.m 2012-05-14 13:42:03 UTC
(rev 18624)
+++ trunk/bibdesk_ios/bibdesk/BDSKTableSortDescriptor.m 2012-05-14 13:57:52 UTC
(rev 18625)
@@ -60,11 +60,11 @@
}else if([tcID isEqualToString:BDSKTitleString]){
- sortDescriptor = [[self alloc]
initWithKey:@"title.stringByRemovingTeXAndStopWords" ascending:ascend
selector:@selector(localizedCaseInsensitiveCompare:)];
+ sortDescriptor = [[self alloc]
initWithKey:@"title.stringByRemovingTeXAndStopWords" ascending:ascend
selector:@selector(localizedCaseInsensitiveNumericCompare:)];
}else if([tcID isEqualToString:BDSKContainerString]){
- sortDescriptor = [[self alloc]
initWithKey:@"container.stringByRemovingTeXAndStopWords" ascending:ascend
selector:@selector(localizedCaseInsensitiveCompare:)];
+ sortDescriptor = [[self alloc]
initWithKey:@"container.stringByRemovingTeXAndStopWords" ascending:ascend
selector:@selector(localizedCaseInsensitiveNumericCompare:)];
}else if([tcID isEqualToString:BDSKPubDateString]){
@@ -132,7 +132,7 @@
}else if([tcID isEqualToString:BDSKBooktitleString]){
- sortDescriptor = [[self alloc]
initWithKey:@"Booktitle.stringByRemovingTeXAndStopWords" ascending:ascend
selector:@selector(localizedCaseInsensitiveCompare:)];
+ sortDescriptor = [[self alloc]
initWithKey:@"Booktitle.stringByRemovingTeXAndStopWords" ascending:ascend
selector:@selector(localizedCaseInsensitiveNumericCompare:)];
}else if([tcID isBooleanField] || [tcID isTriStateField]){
Modified: trunk/bibdesk_ios/bibdesk/BDSKWebOfScienceParser.m
===================================================================
--- trunk/bibdesk_ios/bibdesk/BDSKWebOfScienceParser.m 2012-05-14 13:42:03 UTC
(rev 18624)
+++ trunk/bibdesk_ios/bibdesk/BDSKWebOfScienceParser.m 2012-05-14 13:57:52 UTC
(rev 18625)
@@ -144,7 +144,8 @@
+ (BOOL)canParseString:(NSString *)string{
// remove leading newlines in case this originates from copy/paste
- return [[string stringByTrimmingCharactersInSet:[NSCharacterSet
newlineCharacterSet]] hasPrefix:@"FN ISI Export Format"];
+ string = [string stringByTrimmingCharactersInSet:[NSCharacterSet
newlineCharacterSet]];
+ return [string hasPrefix:@"FN ISI Export Format"] || [string
hasPrefix:@"FN Thomson Reuters Web of Knowledge"];
}
+ (NSArray *)itemsFromString:(NSString *)itemString error:(NSError **)outError{
Modified: trunk/bibdesk_ios/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk_ios/bibdesk/BibDocument.m 2012-05-14 13:42:03 UTC (rev
18624)
+++ trunk/bibdesk_ios/bibdesk/BibDocument.m 2012-05-14 13:57:52 UTC (rev
18625)
@@ -1305,7 +1305,6 @@
NSString *filePath;
NSString *commonParent = nil;
BOOL success = YES;
- BOOL isDir;
NSMutableSet *localFiles = [NSMutableSet set];
if ((success = [fm createDirectoryAtPath:folderPath
withIntermediateDirectories:NO attributes:nil error:NULL])) {
Modified: trunk/bibdesk_ios/bibdesk/BibDocument_Actions.m
===================================================================
--- trunk/bibdesk_ios/bibdesk/BibDocument_Actions.m 2012-05-14 13:42:03 UTC
(rev 18624)
+++ trunk/bibdesk_ios/bibdesk/BibDocument_Actions.m 2012-05-14 13:57:52 UTC
(rev 18625)
@@ -1492,7 +1492,7 @@
[oPanel beginSheetForDirectory:nil
file:nil
-
types:[NSAttributedString textTypes]
+ types:nil
modalForWindow:documentWindow
modalDelegate:self
didEndSelector:@selector(importOpenPanelDidEnd:returnCode:contextInfo:)
Modified: trunk/bibdesk_ios/bibdesk/Bibdesk.xcodeproj/project.pbxproj
===================================================================
--- trunk/bibdesk_ios/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2012-05-14
13:42:03 UTC (rev 18624)
+++ trunk/bibdesk_ios/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2012-05-14
13:57:52 UTC (rev 18625)
@@ -4607,7 +4607,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = CE17EE7E0E24F27400DE06EA
/* BibDesk-App.xcconfig */;
buildSettings = {
- CURRENT_PROJECT_VERSION = 2491;
+ CURRENT_PROJECT_VERSION = 2554;
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
@@ -4616,7 +4616,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = CE17EE7E0E24F27400DE06EA
/* BibDesk-App.xcconfig */;
buildSettings = {
- CURRENT_PROJECT_VERSION = 2491;
+ CURRENT_PROJECT_VERSION = 2554;
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
Modified: trunk/bibdesk_ios/bibdesk/DeveloperDocumentation/HowtoRelease.txt
===================================================================
--- trunk/bibdesk_ios/bibdesk/DeveloperDocumentation/HowtoRelease.txt
2012-05-14 13:42:03 UTC (rev 18624)
+++ trunk/bibdesk_ios/bibdesk/DeveloperDocumentation/HowtoRelease.txt
2012-05-14 13:57:52 UTC (rev 18625)
@@ -41,4 +41,4 @@
- copy the edited bibdesk.xml back to the server
-- post appropriate messages to bibdesk-announce and bibdesk-users (someone
should also post to macosx-tex)
+- post appropriate messages to bibdesk-announce and bibdesk-users (someone
should also post to macosx-tex)
\ No newline at end of file
Modified: trunk/bibdesk_ios/bibdesk/English.lproj/BibDeskHelp/version.texi
===================================================================
--- trunk/bibdesk_ios/bibdesk/English.lproj/BibDeskHelp/version.texi
2012-05-14 13:42:03 UTC (rev 18624)
+++ trunk/bibdesk_ios/bibdesk/English.lproj/BibDeskHelp/version.texi
2012-05-14 13:57:52 UTC (rev 18625)
@@ -1 +1 @@
-@set VERSION 1.5.7
\ No newline at end of file
+@set VERSION 1.5.8
\ No newline at end of file
Modified: trunk/bibdesk_ios/bibdesk/Info.plist
===================================================================
--- trunk/bibdesk_ios/bibdesk/Info.plist 2012-05-14 13:42:03 UTC (rev
18624)
+++ trunk/bibdesk_ios/bibdesk/Info.plist 2012-05-14 13:57:52 UTC (rev
18625)
@@ -261,7 +261,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.5.7</string>
+ <string>1.5.8</string>
<key>CFBundleSignature</key>
<string>BDSK</string>
<key>CFBundleURLTypes</key>
Modified: trunk/bibdesk_ios/bibdesk/RelNotes.rtf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
