[Bibdesk-commit] SF.net SVN: bibdesk:[27299] trunk/bibdesk/BDSKTeXTask.m

[hofman--- via Bibdesk-commit]

Revision: 27299
          http://sourceforge.net/p/bibdesk/svn/27299
Author:   hofman
Date:     2022-03-12 18:49:11 +0000 (Sat, 12 Mar 2022)
Log Message:
-----------
Combine latex and amsref latex checks and extraction code

Modified Paths:
--------------
    trunk/bibdesk/BDSKTeXTask.m

Modified: trunk/bibdesk/BDSKTeXTask.m
===================================================================
--- trunk/bibdesk/BDSKTeXTask.m 2022-03-12 18:40:31 UTC (rev 27298)
+++ trunk/bibdesk/BDSKTeXTask.m 2022-03-12 18:49:11 UTC (rev 27299)
@@ -51,6 +51,7 @@
        BDSKGeneratedNoneMask = 0,
        BDSKGeneratedAMSRefsLaTeXMask = 1 << BDSKGenerateAMSRefsLaTeX,
        BDSKGeneratedLaTeXMask = 1 << BDSKGenerateLaTeX,
+    BDSKGeneratedAnyLaTeXMask = BDSKGeneratedAMSRefsLaTeXMask | 
BDSKGeneratedLaTeXMask,
        BDSKGeneratedPDFMask = 1 << BDSKGeneratePDF,
 };
 
@@ -287,20 +288,18 @@
 // which one was generated depends on the generatedType argument, and can be 
seen from the generatedDataMask flag
 - (NSString *)laTeXString{
     NSString *string = nil;
-    if ((generatedDataMask & BDSKGeneratedLaTeXMask)) {
+    if ((generatedDataMask & BDSKGeneratedAnyLaTeXMask)) {
         string = [NSString stringWithContentsOfFile:[texPath bblFilePath] 
encoding:[[NSUserDefaults standardUserDefaults] 
integerForKey:BDSKTeXPreviewFileEncodingKey] error:NULL];
         NSUInteger start, end;
-        start = [string rangeOfString:@"\\bibitem"].location;
-        end = [string rangeOfString:@"\\end{thebibliography}" 
options:NSBackwardsSearch].location;
+        if ((generatedDataMask & BDSKGeneratedLaTeXMask)) {
+            start = [string rangeOfString:@"\\bibitem"].location;
+            end = [string rangeOfString:@"\\end{thebibliography}" 
options:NSBackwardsSearch].location;
+        } else {
+            start = [string rangeOfString:@"\\bib{"].location;
+            end = [string rangeOfString:@"\\end{biblist}" 
options:NSBackwardsSearch].location;
+        }
         if (start != NSNotFound && end != NSNotFound)
             string = [string substringWithRange:NSMakeRange(start, end - 
start)];
-    } else if ((generatedDataMask & BDSKGeneratedAMSRefsLaTeXMask)) {
-        string = [NSString stringWithContentsOfFile:[texPath bblFilePath] 
encoding:[[NSUserDefaults standardUserDefaults] 
integerForKey:BDSKTeXPreviewFileEncodingKey] error:NULL];
-        NSUInteger start, end;
-        start = [string rangeOfString:@"\\bib{"].location;
-        end = [string rangeOfString:@"\\end{biblist}" 
options:NSBackwardsSearch].location;
-        if (start != NSNotFound && end != NSNotFound)
-            string = [string substringWithRange:NSMakeRange(start, end - 
start)];
     }
     return string;
 }
@@ -314,7 +313,7 @@
 }
 
 - (NSString *)laTeXFilePath{
-    return (generatedDataMask & BDSKGeneratedLaTeXMask) ? [texPath 
bblFilePath] : (generatedDataMask & BDSKGeneratedAMSRefsLaTeXMask) ? [texPath 
bblFilePath] : nil;
+    return (generatedDataMask & BDSKGeneratedAnyLaTeXMask) ? [texPath 
bblFilePath] : nil;
 }
 
 - (NSString *)PDFFilePath{
@@ -437,7 +436,7 @@
     NSString *commandKey = nil;
     NSString *extraArg = nil;
     
-    if ((type & (BDSKGeneratedLaTeXMask | BDSKGeneratedAMSRefsLaTeXMask))) {
+    if ((type & BDSKGeneratedAnyLaTeXMask)) {
         // This task runs bibtex on our bib file 
         commandKey = BDSKBibTeXBinPathKey;
     } else {

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit