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

[hofman--- via Bibdesk-commit]

Revision: 28830
          http://sourceforge.net/p/bibdesk/svn/28830
Author:   hofman
Date:     2024-03-05 15:09:11 +0000 (Tue, 05 Mar 2024)
Log Message:
-----------
Allow getting date for prefer format from year and month. Use correct tags.

Modified Paths:
--------------
    trunk/bibdesk/BibItem.m
    trunk/bibdesk/TypeInfo.plist

Modified: trunk/bibdesk/BibItem.m
===================================================================
--- trunk/bibdesk/BibItem.m     2024-03-05 10:39:31 UTC (rev 28829)
+++ trunk/bibdesk/BibItem.m     2024-03-05 15:09:11 UTC (rev 28830)
@@ -2009,7 +2009,6 @@
     // enumerate the remaining keys
     NSString *tag;
     NSString *v;
-    NSArray *a;
     
     for (NSString *k in keys) {
         tag = [btm referTagForBibTeXFieldName:k];
@@ -2021,30 +2020,29 @@
         if ([NSString isEmptyString:v]) continue;
         
         if ([k isPersonField]) {
-            a = [[self peopleArrayForField:k] valueForKey:@"normalizedName"];
-            for (v in a)
-                [s appendFormat:@"%%%@ %@\n", k, v];
+            v = [[[self peopleArrayForField:k] valueForKey:@"normalizedName"] 
componentsJoinedByString:[NSString stringWithFormat:@"\n%%%@ ", tag]];
         } else if ([k isEqualToString:BDSKKeywordsString]) {
-            a = [self groupArrayForField:k];
-            for (v in a)
-                [s appendFormat:@"%%%@ %@\n", k, v];
+            v = [[self groupArrayForField:k]componentsJoinedByString:[NSString 
stringWithFormat:@"\n%%%@ ", tag]];
         } else if ([k isEqualToString:BDSKPagesString]) {
             NSRange r = [v rangeOfString:@" -- "];
             if (r.length == 0)
                 r = [v rangeOfString:@"-"];
             if (r.length)
-                [s appendFormat:@"%%%@ %@-%@\n", k, [v 
substringWithRange:NSMakeRange(0, r.location)], [v 
substringFromIndex:NSMaxRange(r)]];
-            else
-                [s appendFormat:@"%%%@ %@\n", k, [v stringByRemovingTeX]];
-        } else if (useURLField || [k isEqualToString:BDSKUrlString] == NO) {
-            [s appendFormat:@"%%%@ %@\n", k, [v stringByRemovingTeX]];
+                v = [NSString stringWithFormat:@"%@-%@", [v 
substringWithRange:NSMakeRange(0, r.location)], [v 
substringFromIndex:NSMaxRange(r)]];
+        } else if ([k isEqualToString:BDSKYearString]) {
+            NSInteger m = [NSDate monthFromString:[self 
valueOfField:BDSKMonthString]];
+            v = [NSDate formattedDateForMonth:m year:[NSDate 
yearFromString:v]];
+        } else if (([k isEqualToString:BDSKDateString] && year != 0) ||
+                   ([k isEqualToString:BDSKUrlString] && useURLField)) {
+            continue;
         }
+        
+        [s appendFormat:@"%%%@ %@\n", tag, [v stringByRemovingTeX]];
     }
     
     if (useURLField == NO) {
-        a = [[self remoteURLs] valueForKeyPath:@"URL.absoluteString"];
-        for (v in a)
-            [s appendFormat:@"%%U %@\n", v];
+        v = [[[self remoteURLs] valueForKeyPath:@"URL.absoluteString"] 
componentsJoinedByString:@"\n%%U "];
+        [s appendFormat:@"%%U %@\n", v];
     }
     
     return s;

Modified: trunk/bibdesk/TypeInfo.plist
===================================================================
--- trunk/bibdesk/TypeInfo.plist        2024-03-05 10:39:31 UTC (rev 28829)
+++ trunk/bibdesk/TypeInfo.plist        2024-03-05 15:09:11 UTC (rev 28830)
@@ -1513,6 +1513,8 @@
                <string>E</string>
                <key>Journal</key>
                <string>J</string>
+               <key>Year</key>
+               <string>D</string>
                <key>Keywords</key>
                <string>K</string>
                <key>Number</key>

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