Revision: 28865
          http://sourceforge.net/p/bibdesk/svn/28865
Author:   hofman
Date:     2024-04-25 22:42:39 +0000 (Thu, 25 Apr 2024)
Log Message:
-----------
Ignore all invalid group fields for completion

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

Modified: trunk/bibdesk/BDSKCompletionManager.m
===================================================================
--- trunk/bibdesk/BDSKCompletionManager.m       2024-04-25 15:57:08 UTC (rev 
28864)
+++ trunk/bibdesk/BDSKCompletionManager.m       2024-04-25 22:42:39 UTC (rev 
28865)
@@ -75,11 +75,10 @@
 
 - (void)addString:(NSString *)string forCompletionEntry:(NSString *)entry {
     
-    if ([NSString isEmptyString:entry] || [entry isNumericField] || [entry 
isURLField] || [entry isPersonField] || [entry isNoteField] || [entry 
isCitationField] || [entry hasPrefix:@"Bdsk-"])
+    if ([entry isEqualToString:BDSKTitleString])
+        entry = BDSKBooktitleString;
+    else if ([NSString isEmptyString:entry] || [entry isInvalidGroupField] || 
[entry isPersonField] || [entry isCitationField] || [entry 
isEqualToString:BDSKYearString] || [entry hasPrefix:@"Bdsk-"])
                return;
-
-    if ([entry isEqualToString:BDSKBooktitleString])   
-               entry = BDSKTitleString;
        
     NSMutableSet *completionSet = [self setForCompletionEntry:entry];
     
@@ -103,11 +102,10 @@
 
 - (void)removeString:(NSString *)string forCompletionEntry:(NSString *)entry {
     
-    if ([NSString isEmptyString:entry] || [entry isNumericField] || [entry 
isURLField] || [entry isPersonField] || [entry isNoteField] || [entry 
isCitationField] || [entry hasPrefix:@"Bdsk-"])
+    if ([entry isEqualToString:BDSKTitleString])
+        entry = BDSKBooktitleString;
+    else if ([NSString isEmptyString:entry] || [entry isInvalidGroupField] || 
[entry isPersonField] || [entry isCitationField] || [entry 
isEqualToString:BDSKYearString] || [entry hasPrefix:@"Bdsk-"])
         return;
-
-    if ([entry isEqualToString:BDSKBooktitleString])
-        entry = BDSKTitleString;
     
     NSMutableSet *completionSet = [autoCompletionDict objectForKey:entry];
     
@@ -227,9 +225,7 @@
     // all persons are keyed to author
        if ([entry isPersonField])
                entry = BDSKAuthorString;
-       else if ([entry isEqualToString:BDSKBooktitleString])   
-               entry = BDSKTitleString;
-       else if ([entry isCitationField])       
+       else if ([entry isCitationField])
                entry = BDSKCrossrefString;
        
        NSString *matchString = [[fullString substringWithRange:charRange] 
stringByRemovingCurlyBraces];

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

Reply via email to