Revision: 22635
http://sourceforge.net/p/bibdesk/svn/22635
Author: hofman
Date: 2018-09-18 22:04:31 +0000 (Tue, 18 Sep 2018)
Log Message:
-----------
Return rich text as attributed string with rich text property as object
specifier declared as rich text from script commands, no need to declare as
specifier
Modified Paths:
--------------
trunk/bibdesk/BDSKRichTextForCommand.m
trunk/bibdesk/BDSKTemplatedTextCommand.m
trunk/bibdesk/NSAttributedString+Scripting.h
trunk/bibdesk/NSAttributedString+Scripting.m
trunk/bibdesk/Scripting/BibDesk.sdef
Modified: trunk/bibdesk/BDSKRichTextForCommand.m
===================================================================
--- trunk/bibdesk/BDSKRichTextForCommand.m 2018-09-18 16:10:55 UTC (rev
22634)
+++ trunk/bibdesk/BDSKRichTextForCommand.m 2018-09-18 22:04:31 UTC (rev
22635)
@@ -54,7 +54,7 @@
[self setScriptErrorNumber:NSArgumentsWrongScriptError];
return nil;
}
- return [attrString richTextSpecifier];
+ return attrString;
}
}
Modified: trunk/bibdesk/BDSKTemplatedTextCommand.m
===================================================================
--- trunk/bibdesk/BDSKTemplatedTextCommand.m 2018-09-18 16:10:55 UTC (rev
22634)
+++ trunk/bibdesk/BDSKTemplatedTextCommand.m 2018-09-18 22:04:31 UTC (rev
22635)
@@ -260,7 +260,7 @@
attrString = [[[NSAttributedString alloc] initWithString:string]
autorelease];
}
- return [attrString richTextSpecifier];
+ return attrString;
}
@end
Modified: trunk/bibdesk/NSAttributedString+Scripting.h
===================================================================
--- trunk/bibdesk/NSAttributedString+Scripting.h 2018-09-18 16:10:55 UTC
(rev 22634)
+++ trunk/bibdesk/NSAttributedString+Scripting.h 2018-09-18 22:04:31 UTC
(rev 22635)
@@ -45,7 +45,6 @@
- (NSTextStorage *)scriptingRichText;
- (NSScriptObjectSpecifier *)objectSpecifier;
-- (NSScriptObjectSpecifier *)richTextSpecifier;
@end
Modified: trunk/bibdesk/NSAttributedString+Scripting.m
===================================================================
--- trunk/bibdesk/NSAttributedString+Scripting.m 2018-09-18 16:10:55 UTC
(rev 22634)
+++ trunk/bibdesk/NSAttributedString+Scripting.m 2018-09-18 22:04:31 UTC
(rev 22635)
@@ -52,11 +52,7 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
NSScriptClassDescription *containerClassDescription =
[NSScriptClassDescription classDescriptionForClass:[NSApp class]];
- return [[[NSNameSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:containerClassDescription
containerSpecifier:nil key:@"richTextFormat" name:[self scriptingName]]
autorelease];
-}
-
-- (NSScriptObjectSpecifier *)richTextSpecifier {
- NSScriptObjectSpecifier *rtfSpecifier = [self objectSpecifier];
+ NSScriptObjectSpecifier *rtfSpecifier = [[[NSNameSpecifier
allocWithZone:[self zone]]
initWithContainerClassDescription:containerClassDescription
containerSpecifier:nil key:@"richTextFormat" name:[self scriptingName]]
autorelease];
return [[[NSPropertySpecifier alloc]
initWithContainerClassDescription:[rtfSpecifier keyClassDescription]
containerSpecifier:rtfSpecifier key:@"scriptingRichText"] autorelease];
}
Modified: trunk/bibdesk/Scripting/BibDesk.sdef
===================================================================
--- trunk/bibdesk/Scripting/BibDesk.sdef 2018-09-18 16:10:55 UTC (rev
22634)
+++ trunk/bibdesk/Scripting/BibDesk.sdef 2018-09-18 22:04:31 UTC (rev
22635)
@@ -625,7 +625,7 @@
<type type="publication" list="yes"/>
<cocoa key="in"/>
</parameter>
- <result description="the templated rich text" type="specifier">
+ <result description="the templated rich text" type="rich text">
</result>
</command>
@@ -729,7 +729,7 @@
description="Convert raw RTF data to rich text.">
<cocoa class="BDSKRichTextForCommand"/>
<direct-parameter type="RTF" description="The raw RTF data."/>
- <result description="The rich text" type="specifier"/>
+ <result description="The rich text" type="rich text"/>
</command>
<class-extension extends="application"
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
