[Bibdesk-commit] SF.net SVN: bibdesk:[22445] trunk/bibdesk

[hofman--- via Bibdesk-commit]

Revision: 22445
          http://sourceforge.net/p/bibdesk/svn/22445
Author:   hofman
Date:     2018-07-21 09:25:48 +0000 (Sat, 21 Jul 2018)
Log Message:
-----------
check for specifier argument rather than specific specifiers

Modified Paths:
--------------
    trunk/bibdesk/BibPref_AutoFile.m
    trunk/bibdesk/BibPref_CiteKey.m

Modified: trunk/bibdesk/BibPref_AutoFile.m
===================================================================
--- trunk/bibdesk/BibPref_AutoFile.m    2018-07-21 09:14:36 UTC (rev 22444)
+++ trunk/bibdesk/BibPref_AutoFile.m    2018-07-21 09:25:48 UTC (rev 22445)
@@ -278,19 +278,13 @@
        if ([newSpecifier isEqualToString:@"%0"] || [newSpecifier 
isEqualToString:@"%%"]) {
                selRange.location -= 1;
                selRange.length = 1;
-       }
-       else if ([newSpecifier isEqualToString:@"%f{}0"] || [newSpecifier 
isEqualToString:@"%w{}[ ]0"] || [newSpecifier isEqualToString:@"%s{}[][][]0"] 
|| [newSpecifier isEqualToString:@"%c{}"] || [newSpecifier 
isEqualToString:@"%i{}0"]) {
-               selRange.location += 1;
-               selRange.length = 0;
-       }
-       else if ([newSpecifier isEqualToString:@"%f{Cite Key}"]) {
-               selRange.location += 10;
-               selRange.length = 0;
-       }
-       else if ([newSpecifier isEqualToString:@"%f{BibTeX Type}"]) {
-               selRange.location += 13;
-               selRange.length = 0;
-       }
+    } else if ([newSpecifier length] > 3 && [newSpecifier characterAtIndex:2] 
=='{') {
+        if ([newSpecifier characterAtIndex:3] =='}')
+            selRange.location += 1;
+        else
+            selRange.location += [newSpecifier length] - 2;
+        selRange.length = 0;
+    }
        [[formatSheetField currentEditor] setSelectedRange:selRange];
 }
 

Modified: trunk/bibdesk/BibPref_CiteKey.m
===================================================================
--- trunk/bibdesk/BibPref_CiteKey.m     2018-07-21 09:14:36 UTC (rev 22444)
+++ trunk/bibdesk/BibPref_CiteKey.m     2018-07-21 09:25:48 UTC (rev 22445)
@@ -193,15 +193,13 @@
        if ([newSpecifier isEqualToString:@"%0"] || [newSpecifier 
isEqualToString:@"%%"]) {
                selRange.location -= 1;
                selRange.length = 1;
-       }
-       else if ([newSpecifier isEqualToString:@"%f{}0"] || [newSpecifier 
isEqualToString:@"%w{}[ ]0"] || [newSpecifier isEqualToString:@"%s{}[][][]0"] 
|| [newSpecifier isEqualToString:@"%c{}"] || [newSpecifier 
isEqualToString:@"%i{}0"]) {
-        selRange.location += 1;
+       } else if ([newSpecifier length] > 3 && [newSpecifier 
characterAtIndex:2] =='{') {
+        if ([newSpecifier characterAtIndex:3] =='}')
+            selRange.location += 1;
+        else
+            selRange.location += [newSpecifier length] - 2;
                selRange.length = 0;
        }
-       else if ([newSpecifier isEqualToString:@"%f{BibTeX Type}"]) {
-               selRange.location += 13;
-               selRange.length = 0;
-       }
        [fieldEditor setSelectedRange:selRange];
 }
 

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


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit