Revision: 28322
http://sourceforge.net/p/bibdesk/svn/28322
Author: hofman
Date: 2023-07-17 09:15:42 +0000 (Mon, 17 Jul 2023)
Log Message:
-----------
make sure base path from saved publications is compared
Modified Paths:
--------------
trunk/bibdesk/BibDocument.m
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2023-07-17 08:49:09 UTC (rev 28321)
+++ trunk/bibdesk/BibDocument.m 2023-07-17 09:15:42 UTC (rev 28322)
@@ -1425,14 +1425,6 @@
NSString *encodingName = [NSString localizedNameOfStringEncoding:encoding];
NSStringEncoding groupsEncoding = [BDSKBibTeXParser
isUnparseableEncoding:encoding] ? encoding : NSUTF8StringEncoding;
- BDSKBibTeXOption options = 0;
- if ([[NSUserDefaults standardUserDefaults]
boolForKey:BDSKShouldTeXifyWhenSavingAndCopyingKey])
- options |= BDSKBibTeXOptionTeXify;
- if (drop)
- options |= BDSKBibTeXOptionDropInternal;
- if (docFlags.isExporting && aBasePath && [self fileURL] && [aBasePath
isEqualToString:[self basePath]] == NO)
- options |= BDSKBibTeXOptionRedirectRelativeFiles;
-
if([[NSUserDefaults standardUserDefaults]
boolForKey:BDSKShouldUseTemplateFileKey]){
NSMutableString *templateFile = [NSMutableString
stringWithContentsOfFile:[[[NSUserDefaults standardUserDefaults]
stringForKey:BDSKOutputTemplateFileKey] stringByExpandingTildeInPath]
usedEncoding:NULL error:NULL] ?: [NSMutableString string];
@@ -1502,6 +1494,18 @@
NSArray *pubs = [self publicationsForSaving];
if ([pubs count] > 0) {
+ BDSKBibTeXOption options = 0;
+ if ([[NSUserDefaults standardUserDefaults]
boolForKey:BDSKShouldTeXifyWhenSavingAndCopyingKey])
+ options |= BDSKBibTeXOptionTeXify;
+ if (drop)
+ options |= BDSKBibTeXOptionDropInternal;
+ if (docFlags.isExporting && aBasePath) {
+ // exported pubs can come from an external group
+ NSString *pubBasePath = [[[pubs firstObject] owner] basePath];
+ if (pubBasePath && [aBasePath isEqualToString:pubBasePath] == NO)
+ options |= BDSKBibTeXOptionRedirectRelativeFiles;
+ }
+
hasData = YES;
for (BibItem *pub in pubs){
if (isOK == NO) break;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
