Revision: 22637
http://sourceforge.net/p/bibdesk/svn/22637
Author: hofman
Date: 2018-09-19 11:50:04 +0000 (Wed, 19 Sep 2018)
Log Message:
-----------
Revert earlier commit, return rich text as specifier, as the AppleScript
sometimes cannot handle attributed string as rich text
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-19 06:30:44 UTC (rev
22636)
+++ trunk/bibdesk/BDSKRichTextForCommand.m 2018-09-19 11:50:04 UTC (rev
22637)
@@ -54,7 +54,7 @@
[self setScriptErrorNumber:NSArgumentsWrongScriptError];
return nil;
}
- return attrString;
+ return [attrString richTextSpecifier];
}
}
Modified: trunk/bibdesk/BDSKTemplatedTextCommand.m
===================================================================
--- trunk/bibdesk/BDSKTemplatedTextCommand.m 2018-09-19 06:30:44 UTC (rev
22636)
+++ trunk/bibdesk/BDSKTemplatedTextCommand.m 2018-09-19 11:50:04 UTC (rev
22637)
@@ -260,7 +260,7 @@
attrString = [[[NSAttributedString alloc] initWithString:string]
autorelease];
}
- return attrString;
+ return [attrString richTextSpecifier];
}
@end
Modified: trunk/bibdesk/NSAttributedString+Scripting.h
===================================================================
--- trunk/bibdesk/NSAttributedString+Scripting.h 2018-09-19 06:30:44 UTC
(rev 22636)
+++ trunk/bibdesk/NSAttributedString+Scripting.h 2018-09-19 11:50:04 UTC
(rev 22637)
@@ -45,6 +45,7 @@
- (NSTextStorage *)scriptingRichText;
- (NSScriptObjectSpecifier *)objectSpecifier;
+- (NSScriptObjectSpecifier *)richTextSpecifier;
@end
Modified: trunk/bibdesk/NSAttributedString+Scripting.m
===================================================================
--- trunk/bibdesk/NSAttributedString+Scripting.m 2018-09-19 06:30:44 UTC
(rev 22636)
+++ trunk/bibdesk/NSAttributedString+Scripting.m 2018-09-19 11:50:04 UTC
(rev 22637)
@@ -52,7 +52,11 @@
- (NSScriptObjectSpecifier *)objectSpecifier {
NSScriptClassDescription *containerClassDescription =
[NSScriptClassDescription classDescriptionForClass:[NSApp class]];
- NSScriptObjectSpecifier *rtfSpecifier = [[[NSNameSpecifier
allocWithZone:[self zone]]
initWithContainerClassDescription:containerClassDescription
containerSpecifier:nil key:@"richTextFormat" name:[self scriptingName]]
autorelease];
+ return [[[NSNameSpecifier allocWithZone:[self zone]]
initWithContainerClassDescription:containerClassDescription
containerSpecifier:nil key:@"richTextFormat" name:[self scriptingName]]
autorelease];
+}
+
+- (NSScriptObjectSpecifier *)richTextSpecifier {
+ NSScriptObjectSpecifier *rtfSpecifier = [self objectSpecifier];
return [[[NSPropertySpecifier alloc]
initWithContainerClassDescription:[rtfSpecifier keyClassDescription]
containerSpecifier:rtfSpecifier key:@"scriptingRichText"] autorelease];
}
Modified: trunk/bibdesk/Scripting/BibDesk.sdef
===================================================================
--- trunk/bibdesk/Scripting/BibDesk.sdef 2018-09-19 06:30:44 UTC (rev
22636)
+++ trunk/bibdesk/Scripting/BibDesk.sdef 2018-09-19 11:50:04 UTC (rev
22637)
@@ -625,7 +625,7 @@
<type type="publication" list="yes"/>
<cocoa key="in"/>
</parameter>
- <result description="the templated rich text" type="rich text">
+ <result description="the templated rich text" type="specifier">
</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="rich text"/>
+ <result description="The rich text" type="specifier"/>
</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
