Revision: 27294
http://sourceforge.net/p/bibdesk/svn/27294
Author: hofman
Date: 2022-03-11 10:09:19 +0000 (Fri, 11 Mar 2022)
Log Message:
-----------
remove intermediate properties to check generatedType bitmask components
Modified Paths:
--------------
trunk/bibdesk/BDSKItemPasteboardHelper.m
trunk/bibdesk/BDSKTeXTask.h
trunk/bibdesk/BDSKTeXTask.m
Modified: trunk/bibdesk/BDSKItemPasteboardHelper.m
===================================================================
--- trunk/bibdesk/BDSKItemPasteboardHelper.m 2022-03-11 07:30:30 UTC (rev
27293)
+++ trunk/bibdesk/BDSKItemPasteboardHelper.m 2022-03-11 10:09:19 UTC (rev
27294)
@@ -200,7 +200,7 @@
if ([texTask runWithBibTeXString:bibString citeKeys:citeKeys
generatedType:generatedType]) {
if (dragCopyType == BDSKDragCopyLaTeX || dragCopyType ==
BDSKDragCopyLTB) {
- string = [texTask LaTeXString];
+ string = [texTask laTeXString];
} else {
data = [texTask PDFData];
if (dragCopyType == BDSKDragCopyRTF && data) {
Modified: trunk/bibdesk/BDSKTeXTask.h
===================================================================
--- trunk/bibdesk/BDSKTeXTask.h 2022-03-11 07:30:30 UTC (rev 27293)
+++ trunk/bibdesk/BDSKTeXTask.h 2022-03-11 10:09:19 UTC (rev 27294)
@@ -81,11 +81,11 @@
- (void)terminate;
@property (nonatomic, readonly) NSString *logFileString;
-@property (nonatomic, readonly) NSString *LaTeXString;
+@property (nonatomic, readonly) NSString *laTeXString;
@property (nonatomic, readonly) NSData *PDFData;
@property (nonatomic, readonly) NSString *logFilePath;
-@property (nonatomic, readonly) NSString *LaTeXFilePath;
+@property (nonatomic, readonly) NSString *laTeXFilePath;
@property (nonatomic, readonly) NSString *PDFFilePath;
@property (nonatomic, readonly, getter=isProcessing) BOOL processing;
Modified: trunk/bibdesk/BDSKTeXTask.m
===================================================================
--- trunk/bibdesk/BDSKTeXTask.m 2022-03-11 07:30:30 UTC (rev 27293)
+++ trunk/bibdesk/BDSKTeXTask.m 2022-03-11 10:09:19 UTC (rev 27294)
@@ -86,10 +86,6 @@
@interface BDSKTeXTask ()
-@property (nonatomic, readonly) BOOL hasLTB;
-@property (nonatomic, readonly) BOOL hasLaTeX;
-@property (nonatomic, readonly) BOOL hasPDFData;
-
- (NSArray *)helperFileURLs;
- (void)writeHelperFiles;
@@ -132,7 +128,7 @@
@implementation BDSKTeXTask
-@dynamic logFileString, LaTeXString, PDFData, logFilePath, LaTeXFilePath,
PDFFilePath, hasLTB, hasLaTeX, hasPDFData, processing;
+@dynamic logFileString, laTeXString, PDFData, logFilePath, laTeXFilePath,
PDFFilePath, processing;
+ (void)initialize
{
@@ -289,10 +285,10 @@
}
// the .bbl file contains either a LaTeX style bilbiography or an Amsrefs ltb
style bibliography
-// which one was generated depends on the generatedType argument, and can be
seen from the hasLTB and hasLaTeX flags
-- (NSString *)LaTeXString{
+// which one was generated depends on the generatedType argument, and can be
seen from the generatedDataMask flag
+- (NSString *)laTeXString{
NSString *string = nil;
- if([self hasLaTeX]) {
+ if ((generatedDataMask & BDSKGeneratedLaTeXMask)) {
string = [NSString stringWithContentsOfFile:[texPath bblFilePath]
encoding:[[NSUserDefaults standardUserDefaults]
integerForKey:BDSKTeXPreviewFileEncodingKey] error:NULL];
NSUInteger start, end;
start = [string rangeOfString:@"\\bibitem"].location;
@@ -299,7 +295,7 @@
end = [string rangeOfString:@"\\end{thebibliography}"
options:NSBackwardsSearch].location;
if (start != NSNotFound && end != NSNotFound)
string = [string substringWithRange:NSMakeRange(start, end -
start)];
- } else if([self hasLTB]) {
+ } else if ((generatedDataMask & BDSKGeneratedAMSRefsLaTeXMask)) {
string = [NSString stringWithContentsOfFile:[texPath bblFilePath]
encoding:[[NSUserDefaults standardUserDefaults]
integerForKey:BDSKTeXPreviewFileEncodingKey] error:NULL];
NSUInteger start, end;
start = [string rangeOfString:@"\\bib{"].location;
@@ -311,7 +307,7 @@
}
- (NSData *)PDFData{
- return [self hasPDFData] ? [NSData dataWithContentsOfFile:[texPath
pdfFilePath]] : nil;
+ return (generatedDataMask & BDSKGeneratedPDFMask) ? [NSData
dataWithContentsOfFile:[texPath pdfFilePath]] : nil;
}
- (NSString *)logFilePath{
@@ -318,26 +314,14 @@
return [texPath logFilePath];
}
-- (NSString *)LaTeXFilePath{
- return [self hasLaTeX] ? [texPath bblFilePath] : [self hasLTB] ? [texPath
bblFilePath] : nil;
+- (NSString *)laTeXFilePath{
+ return (generatedDataMask & BDSKGeneratedLaTeXMask) ? [texPath
bblFilePath] : (generatedDataMask & BDSKGeneratedAMSRefsLaTeXMask) ? [texPath
bblFilePath] : nil;
}
- (NSString *)PDFFilePath{
- return [self hasPDFData] ? [texPath pdfFilePath] : nil;
+ return (generatedDataMask & BDSKGeneratedPDFMask) ? [texPath pdfFilePath]
: nil;
}
-- (BOOL)hasLTB{
- return 0 != (generatedDataMask & BDSKGeneratedAMSRefsLaTeXMask);
-}
-
-- (BOOL)hasLaTeX{
- return 0 != (generatedDataMask & BDSKGeneratedLaTeXMask);
-}
-
-- (BOOL)hasPDFData{
- return 0 != (generatedDataMask & BDSKGeneratedPDFMask);
-}
-
- (BOOL)isProcessing{
return currentTask != nil;
}
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
