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

[hofman--- via Bibdesk-commit]

Revision: 22451
          http://sourceforge.net/p/bibdesk/svn/22451
Author:   hofman
Date:     2018-07-22 09:49:33 +0000 (Sun, 22 Jul 2018)
Log Message:
-----------
add paragraph style in format parser and fix attributes

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

Modified: trunk/bibdesk/BDSKFormatParser.m
===================================================================
--- trunk/bibdesk/BDSKFormatParser.m    2018-07-22 09:42:51 UTC (rev 22450)
+++ trunk/bibdesk/BDSKFormatParser.m    2018-07-22 09:49:33 UTC (rev 22451)
@@ -49,6 +49,7 @@
 #import "BDSKLinkedFile.h"
 #import "BDSKAppController.h"
 #import "NSFileManager_BDSKExtensions.h"
+#import "NSParagraphStyle_BDSKExtensions.h"
 
 
 @implementation BDSKFormatParser
@@ -1157,9 +1158,12 @@
                if (error != NULL)
                        *error = errorMsg;
        }
-       if (attrString != nil) 
+    if (attrString != nil)  {
+        [attrString addAttribute:NSParagraphStyleAttributeName 
value:[NSParagraphStyle defaultClippingParagraphStyle] range:NSMakeRange(0, 
[attrString length])];
+        [attrString fixAttributesInRange:NSMakeRange(0, [attrString length])];
                *attrFormatString = [attrString autorelease];
-       
+    }
+    
        [sanitizedFormatString release];
        
        return (errorMsg == nil);

Modified: trunk/bibdesk/BibPref_AutoFile.m
===================================================================
--- trunk/bibdesk/BibPref_AutoFile.m    2018-07-22 09:42:51 UTC (rev 22450)
+++ trunk/bibdesk/BibPref_AutoFile.m    2018-07-22 09:49:33 UTC (rev 22451)
@@ -45,7 +45,6 @@
 #import "BDSKStringConstants.h"
 #import "NSFileManager_BDSKExtensions.h"
 #import "BDSKTypeManager.h"
-#import "NSParagraphStyle_BDSKExtensions.h"
 
 #define MAX_PREVIEW_WIDTH      501.0
 #define MAX_FORMAT_WIDTH       288.0
@@ -159,13 +158,12 @@
                        [previewTextField setFrame:frame];
                }
                [[self view] setNeedsDisplay:YES];
+        if ([formatString isEqualToString:[attrFormat string]] == NO)
+            [sud setObject:[attrFormat string] forKey:BDSKLocalFileFormatKey];
        } else {
                [previewTextField setStringValue:NSLocalizedString(@"Invalid 
Format", @"Preview for invalid autogeneration format")];
        }
-    NSMutableAttributedString *mutableAttrFormat = [attrFormat mutableCopy];
-    [mutableAttrFormat addAttribute:NSParagraphStyleAttributeName 
value:[NSParagraphStyle defaultClippingParagraphStyle] range:NSMakeRange(0, 
[attrFormat length])];
-    [formatField setAttributedStringValue:mutableAttrFormat];
-    [mutableAttrFormat release];
+       [formatField setAttributedStringValue:attrFormat];
        [formatField sizeToFit];
        frame = [formatField frame];
        if (frame.size.width > MAX_FORMAT_WIDTH) {

Modified: trunk/bibdesk/BibPref_CiteKey.m
===================================================================
--- trunk/bibdesk/BibPref_CiteKey.m     2018-07-22 09:42:51 UTC (rev 22450)
+++ trunk/bibdesk/BibPref_CiteKey.m     2018-07-22 09:49:33 UTC (rev 22451)
@@ -45,7 +45,6 @@
 #import "BDSKAppController.h"
 #import "BDSKPreviewItem.h"
 #import "BDSKTypeManager.h"
-#import "NSParagraphStyle_BDSKExtensions.h"
 
 #define MAX_PREVIEW_WIDTH      481
 #define MAX_FORMAT_WIDTH       266
@@ -133,10 +132,7 @@
        } else {
                [citeKeyLine setStringValue:NSLocalizedString(@"Invalid 
Format", @"Preview for invalid autogeneration format")];
        }
-    NSMutableAttributedString *mutableAttrFormat = [attrFormat mutableCopy];
-    [mutableAttrFormat addAttribute:NSParagraphStyleAttributeName 
value:[NSParagraphStyle defaultClippingParagraphStyle] range:NSMakeRange(0, 
[attrFormat length])];
-       [formatField setAttributedStringValue:mutableAttrFormat];
-    [mutableAttrFormat release];
+       [formatField setAttributedStringValue:attrFormat];
        [formatField sizeToFit];
        frame = [formatField frame];
        if (frame.size.width > MAX_FORMAT_WIDTH) {

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