Revision: 5129
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5129&view=rev
Author:   hofman
Date:     2009-01-19 15:50:06 +0000 (Mon, 19 Jan 2009)

Log Message:
-----------
Remove some RTF accessors that were added to work around rich text problems. 
Instead, create a hidden helper class to represent rich text as a property, so 
we can return it from script commands. The name of the helper class is base-64 
encoded RTF data, so the attributed string can be reconstructed from the object 
specifier.

Modified Paths:
--------------
    trunk/NSData_SKExtensions.h
    trunk/NSData_SKExtensions.m
    trunk/PDFAnnotation_SKExtensions.h
    trunk/PDFAnnotation_SKExtensions.m
    trunk/SKApplicationController.m
    trunk/SKNPDFAnnotationNote_SKExtensions.h
    trunk/SKNPDFAnnotationNote_SKExtensions.m
    trunk/SKTextCommand.m
    trunk/Skim.sdef
    trunk/Skim.xcodeproj/project.pbxproj

Added Paths:
-----------
    trunk/SKRichTextFormat.h
    trunk/SKRichTextFormat.m

Modified: trunk/NSData_SKExtensions.h
===================================================================
--- trunk/NSData_SKExtensions.h 2009-01-17 22:29:12 UTC (rev 5128)
+++ trunk/NSData_SKExtensions.h 2009-01-19 15:50:06 UTC (rev 5129)
@@ -49,6 +49,11 @@
 - (NSString *)hexString;
 - (NSString *)xmlString;
 
+- (id)initWithBase64String:(NSString *)base64String;
+- (id)initWithBase64String:(NSString *)base64String 
withNewlines:(BOOL)encodedWithNewlines;
+- (NSString *)base64String;
+- (NSString *)base64StringWithNewlines:(BOOL)encodeWithNewlines;
+
 + (NSData *)dataWithPointAsQDPoint:(NSPoint)point;
 + (NSData *)dataWithRectAsQDRect:(NSRect)rect;
 

Modified: trunk/NSData_SKExtensions.m
===================================================================
--- trunk/NSData_SKExtensions.m 2009-01-17 22:29:12 UTC (rev 5128)
+++ trunk/NSData_SKExtensions.m 2009-01-19 15:50:06 UTC (rev 5129)
@@ -38,7 +38,8 @@
 
 #import "NSData_SKExtensions.h"
 #import "NSGeometry_SKExtensions.h"
-#import <openssl/md5.h>
+#import <openssl/bio.h>
+#import <openssl/evp.h>
 
 @implementation NSData (SKExtensions)
 
@@ -98,17 +99,17 @@
     return NSNotFound;
 }
 
-#define MD5_SIGNATURE_LENGTH 16
-
 - (NSData *)md5Signature {
-    MD5_CTX md5context;
-    unsigned char signature[MD5_SIGNATURE_LENGTH];
+    EVP_MD_CTX md5context;
+    unsigned char signature[EVP_MAX_MD_SIZE];
+    unsigned int signatureLength = 0;
+    
+    EVP_DigestInit(&md5context, EVP_md5());
+    EVP_DigestUpdate(&md5context, [self bytes], [self length]);
+    EVP_DigestFinal_ex(&md5context, signature, &signatureLength);
+    EVP_MD_CTX_cleanup(&md5context);
 
-    MD5_Init(&md5context);
-    MD5_Update(&md5context, [self bytes], [self length]);
-    MD5_Final(signature, &md5context);
-
-    return [NSData dataWithBytes:signature length:MD5_SIGNATURE_LENGTH];
+    return [NSData dataWithBytes:signature length:signatureLength];
 }
 
 - (NSString *)hexString {
@@ -143,20 +144,70 @@
     return [hexString autorelease];
 }
 
+// base 64 encoding/decoding methods modified from sample code on CocoaDev 
http://www.cocoadev.com/index.pl?BaseSixtyFour
+
+- (id)initWithBase64String:(NSString *)base64String {
+    return [self initWithBase64String:base64String withNewlines:YES];
+}
+
+- (id)initWithBase64String:(NSString *)base64String 
withNewlines:(BOOL)encodedWithNewlines {
+    // Create a memory buffer containing Base64 encoded string data
+    BIO *mem = BIO_new_mem_buf((void *)[base64String 
cStringUsingEncoding:NSASCIIStringEncoding], [base64String 
lengthOfBytesUsingEncoding:NSASCIIStringEncoding]);
+    
+    // Push a Base64 filter so that reading from the buffer decodes it
+    BIO *b64 = BIO_new(BIO_f_base64());
+    if (encodedWithNewlines == NO)
+        BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
+    mem = BIO_push(b64, mem);
+    
+    // Decode into an NSMutableData
+    NSMutableData *data = [[NSMutableData alloc] init];
+    char inbuf[512];
+    int inlen;
+    while ((inlen = BIO_read(mem, inbuf, sizeof(inbuf))) > 0)
+        [data appendBytes:inbuf length:inlen];
+    
+    // Clean up and go home
+    BIO_free_all(mem);
+    
+    self = [self initWithData:data];
+    [data release];
+    
+    return self;
+}
+
+- (NSString *)base64String {
+    return [self base64StringWithNewlines:YES];
+}
+
+- (NSString *)base64StringWithNewlines:(BOOL)encodeWithNewlines {
+    // Create a memory buffer which will contain the Base64 encoded string
+    BIO *mem = BIO_new(BIO_s_mem());
+    
+    // Push on a Base64 filter so that writing to the buffer encodes the data
+    BIO *b64 = BIO_new(BIO_f_base64());
+    if (encodeWithNewlines == NO)
+        BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
+    mem = BIO_push(b64, mem);
+    
+    // Encode all the data
+    BIO_write(mem, [self bytes], [self length]);
+    BIO_flush(mem);
+    
+    // Create a new string from the data in the memory buffer
+    char *base64Pointer;
+    long base64Length = BIO_get_mem_data(mem, &base64Pointer);
+    NSString *base64String = [[[NSString alloc] initWithBytes:base64Pointer 
length:base64Length encoding:NSASCIIStringEncoding] autorelease];
+    
+    // Clean up and go home
+    BIO_free_all(mem);
+    return base64String;
+}
+
 #pragma mark Templating support
 
 - (NSString *)xmlString {
-    NSData *data = [NSPropertyListSerialization dataFromPropertyList:self 
format:NSPropertyListXMLFormat_v1_0 errorDescription:NULL];
-    NSMutableString *string = [[[NSMutableString alloc] initWithData:data 
encoding:NSUTF8StringEncoding] autorelease];
-    int loc = NSMaxRange([string rangeOfString:@"<data>"]);
-    if (loc == NSNotFound)
-        return nil;
-    [string deleteCharactersInRange:NSMakeRange(0, loc)];
-    loc = [string rangeOfString:@"</data>" options:NSBackwardsSearch].location;
-    if (loc == NSNotFound)
-        return nil;
-    [string deleteCharactersInRange:NSMakeRange(loc, [string length] - loc)];
-    return string;
+    return [self base64String];
 }
 
 #pragma mark Scripting support

Modified: trunk/PDFAnnotation_SKExtensions.h
===================================================================
--- trunk/PDFAnnotation_SKExtensions.h  2009-01-17 22:29:12 UTC (rev 5128)
+++ trunk/PDFAnnotation_SKExtensions.h  2009-01-19 15:50:06 UTC (rev 5129)
@@ -109,7 +109,6 @@
 - (id)textContents;
 - (void)setTextContents:(id)text;
 - (id)richText;
-- (id)richTextRTF;
 - (void)setBoundsAsQDRect:(NSData *)inQDBoundsAsData;
 - (NSData *)boundsAsQDRect;
 - (NSString *)fontName;

Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m  2009-01-17 22:29:12 UTC (rev 5128)
+++ trunk/PDFAnnotation_SKExtensions.m  2009-01-19 15:50:06 UTC (rev 5129)
@@ -404,10 +404,6 @@
     return [NSNull null];
 }
 
-- (id)richTextRTF {
-    return [NSNull null];
-}
-
 - (void)setBoundsAsQDRect:(NSData *)inQDBoundsAsData {
     if ([self isMovable]) {
         NSRect newBounds = [inQDBoundsAsData rectValueAsQDRect];

Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m     2009-01-17 22:29:12 UTC (rev 5128)
+++ trunk/SKApplicationController.m     2009-01-19 15:50:06 UTC (rev 5129)
@@ -681,4 +681,9 @@
     return [[NSUserDefaults standardUserDefaults] 
setInteger:SKIconTypeFromScriptingIconType(type) 
forKey:SKAnchoredNoteIconTypeKey];
 }
 
+- (id)valueInRichTextWithName:(NSString *)name {
+    NSData *data = [name dataUsingEncoding:NSUTF8StringEncoding];
+    return [[[NSTextStorage alloc] initWithRTF:data documentAttributes:nil] 
autorelease];
+}
+
 @end

Modified: trunk/SKNPDFAnnotationNote_SKExtensions.h
===================================================================
--- trunk/SKNPDFAnnotationNote_SKExtensions.h   2009-01-17 22:29:12 UTC (rev 
5128)
+++ trunk/SKNPDFAnnotationNote_SKExtensions.h   2009-01-19 15:50:06 UTC (rev 
5129)
@@ -55,5 +55,4 @@
 @interface SKNPDFAnnotationNote (SKExtensions)
 + (NSDictionary *)textToNoteSkimNoteProperties:(NSDictionary *)properties;
 - (void)setRichText:(id)newText;
-- (void)setRichTextRTF:(id)newRTF;
 @end

Modified: trunk/SKNPDFAnnotationNote_SKExtensions.m
===================================================================
--- trunk/SKNPDFAnnotationNote_SKExtensions.m   2009-01-17 22:29:12 UTC (rev 
5128)
+++ trunk/SKNPDFAnnotationNote_SKExtensions.m   2009-01-19 15:50:06 UTC (rev 
5129)
@@ -148,18 +148,6 @@
         return [[NSScriptCoercionHandler sharedCoercionHandler] 
coerceValue:value toClass:[NSTextStorage class]];
 }
 
-- (id)richTextRTF {
-    NSData *data = [textStorage RTFFromRange:NSMakeRange(0, [textStorage 
length]) documentAttributes:NULL];
-    return [NSAppleEventDescriptor descriptorWithDescriptorType:'RTF ' 
data:data];
-}
-
-- (void)setRichTextRTF:(id)newRTF {
-    NSData *data = [newRTF isKindOfClass:[NSAppleEventDescriptor class]] ? 
[newRTF data] : nil;
-    NSAttributedString *attrString = data ? [[[NSAttributedString alloc] 
initWithRTF:data documentAttributes:nil] autorelease] : nil;
-    if (attrString)
-        [textStorage replaceCharactersInRange:NSMakeRange(0, [textStorage 
length]) withAttributedString:attrString];
-}
-
 #pragma mark Accessibility
 
 - (NSArray *)accessibilityAttributeNames {

Added: trunk/SKRichTextFormat.h
===================================================================
--- trunk/SKRichTextFormat.h                            (rev 0)
+++ trunk/SKRichTextFormat.h    2009-01-19 15:50:06 UTC (rev 5129)
@@ -0,0 +1,58 @@
+//
+//  SKRichTextFormat.h
+//  Skim
+//
+//  Created by Christiaan Hofman on 1/19/09.
+/*
+ This software is Copyright (c) 2009
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+
+
+...@interface SKRichTextFormat : NSObject {
+    NSData *data;
+    NSString *name;
+}
+
+- (id)initWithData:(NSData *)aData;
+- (id)initWithName:(NSString *)aName;
+
+- (NSString *)name;
+- (NSTextStorage *)richText;
+
+...@end
+
+
+...@interface NSApplication (SKRichTextFormat)
+- (SKRichTextFormat *)valueInRichTextWithName:(NSString *)name;
+...@end

Added: trunk/SKRichTextFormat.m
===================================================================
--- trunk/SKRichTextFormat.m                            (rev 0)
+++ trunk/SKRichTextFormat.m    2009-01-19 15:50:06 UTC (rev 5129)
@@ -0,0 +1,103 @@
+//
+//  SKRichTextFormat.m
+//  Skim
+//
+//  Created by Christiaan Hofman on 1/19/09.
+/*
+ This software is Copyright (c) 2009
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "SKRichTextFormat.h"
+#import "NSData_SKExtensions.h"
+
+
+...@implementation SKRichTextFormat
+
+- (id)initWithData:(NSData *)aData {
+    if (self = [super init]) {
+        if (aData) {
+            data = [aData retain];
+            name = nil;
+        } else {
+            [self release];
+            self = nil;
+        }
+    }
+    return self;
+}
+
+- (id)initWithName:(NSString *)aName {
+    if (self = [super init]) {
+        if (aName) {
+            name = [aName retain];
+            data = nil;
+        } else {
+            [self release];
+            self = nil;
+        }
+    }
+    return self;
+}
+
+- (void)dealloc {
+    [data release];
+    [name release];
+    [super dealloc];
+}
+
+- (NSScriptObjectSpecifier *)objectSpecifier {
+    NSScriptClassDescription *containerClassDescription = 
(NSScriptClassDescription *)[NSClassDescription classDescriptionForClass:[NSApp 
class]];
+    return [[[NSNameSpecifier allocWithZone:[self zone]] 
initWithContainerClassDescription:containerClassDescription 
containerSpecifier:nil key:@"richText" name:[self name]] autorelease];
+}
+
+- (NSString *)name {
+    if (name == nil)
+        name = [[data base64StringWithNewlines:NO] retain];
+    return name;
+}
+
+- (NSTextStorage *)richText {
+    if (data == nil)
+        data = [[NSData alloc] initWithBase64String:name withNewlines:NO];
+    return data ? [[[NSTextStorage alloc] initWithRTF:data 
documentAttributes:nil] autorelease] : nil;
+}
+
+...@end
+
+
+...@implementation NSApplication (SKRichTextFormat)
+
+- (SKRichTextFormat *)valueInRichTextWithName:(NSString *)name {
+    return [[[SKRichTextFormat alloc] initWithName:name] autorelease];
+}
+
+...@end

Modified: trunk/SKTextCommand.m
===================================================================
--- trunk/SKTextCommand.m       2009-01-17 22:29:12 UTC (rev 5128)
+++ trunk/SKTextCommand.m       2009-01-19 15:50:06 UTC (rev 5129)
@@ -41,6 +41,8 @@
 #import "SKPDFDocument.h"
 #import "PDFAnnotation_SKExtensions.h"
 #import "PDFSelection_SKExtensions.h"
+#import "NSAttributedString_SKExtensions.h"
+#import "SKRichTextFormat.h"
 
 
 @implementation SKTextCommand
@@ -48,26 +50,37 @@
 - (id)performDefaultImplementation {
     id dP = [self directParameter];
     id dPO = nil;
-    if ([dP isKindOfClass:[NSArray class]] == NO)
+    if ([dP respondsToSelector:@selector(objectsByEvaluatingSpecifier)])
         dPO = [dP objectsByEvaluatingSpecifier];
     
     NSDictionary *args = [self evaluatedArguments];
     PDFPage *page = [args objectForKey:@"Page"];
-    NSString *string = nil;
+    NSAttributedString *attributedString = nil;
+    NSData *data = nil;
     
     if ([dPO isKindOfClass:[SKPDFDocument class]]) {
-        string = page ? [page string] : [[dPO pdfDocument] string];
+        attributedString = page ? [page attributedString] : [dPO richText];
     } else if ([dPO isKindOfClass:[PDFPage class]]) {
         if (page == nil || [page isEqual:dPO])
-            string = [dPO string];
+            attributedString = [dPO attributedString];
     } else if ([dPO isKindOfClass:[PDFAnnotation class]]) {
         if (page == nil || [page isEqual:[dPO page]])
-            string = [dPO string];
+            attributedString = [dPO textContents];
+    } else if ([dP isKindOfClass:[NSAppleEventDescriptor class]]) {
+        if ([dP descriptorType] == 'RTF ')
+            data = [dP data];
     } else {
-        string = [[PDFSelection selectionWithSpecifier:dP onPage:page] string];
+        attributedString = [[PDFSelection selectionWithSpecifier:dP 
onPage:page] attributedString];
     }
     
-    return string ?: @"";
+    if (data == nil)
+        data = [attributedString RTFRepresentation];
+    if (data) {
+        NSScriptObjectSpecifier *containerRef = [[[[SKRichTextFormat alloc] 
initWithData:data] autorelease] objectSpecifier];
+        if (containerRef)
+            return [[[NSPropertySpecifier allocWithZone:[self zone]] 
initWithContainerClassDescription:[containerRef keyClassDescription] 
containerSpecifier:containerRef key:@"richText"] autorelease];
+    }
+    return nil;
 }
 
 @end

Modified: trunk/Skim.sdef
===================================================================
--- trunk/Skim.sdef     2009-01-17 22:29:12 UTC (rev 5128)
+++ trunk/Skim.sdef     2009-01-19 15:50:06 UTC (rev 5129)
@@ -22,6 +22,10 @@
                 description="Lines in a TeX source file.">
                 <cocoa key="lines"/>
             </element>
+            <element type="rich text format" access="r" hidden="yes"
+                description="Rich text formats.">
+                <cocoa key="richText"/>
+            </element>
             <property name="name" code="pnam" type="text" access="r"
                 description="The name of the application."/>
             <property name="frontmost" code="pisf" type="boolean" access="r"
@@ -179,9 +183,6 @@
                        <responds-to name="get text for">
                                <cocoa method=""/>
                        </responds-to>
-                       <responds-to name="get RTF for">
-                               <cocoa method=""/>
-                       </responds-to>
                        <responds-to name="get index for">
                                <cocoa method=""/>
                        </responds-to>
@@ -672,9 +673,6 @@
                        <responds-to name="get text for">
                                <cocoa method=""/>
                        </responds-to>
-                       <responds-to name="get RTF for">
-                               <cocoa method=""/>
-                       </responds-to>
                        <responds-to name="get index for">
                                <cocoa method=""/>
                        </responds-to>
@@ -729,10 +727,6 @@
                 description="The rich extended text of an anchored note.">
                 <cocoa key="richText"/>
             </property>
-            <property name="extended RTF" code="XRTF" type="any"
-                description="RTF for the rich extended text of an anchored 
note.">
-                <cocoa key="richTextRTF"/>
-            </property>
             <property name="icon" code="iimg" type="icon type"
                 description="The icon type of an anchored note.">
                 <cocoa key="scriptingIconType"/>
@@ -786,9 +780,6 @@
                        <responds-to name="get text for">
                                <cocoa method=""/>
                        </responds-to>
-                       <responds-to name="get RTF for">
-                               <cocoa method=""/>
-                       </responds-to>
                        <responds-to name="get index for">
                                <cocoa method=""/>
                        </responds-to>
@@ -812,6 +803,19 @@
             </property>
         </class>
 
+        <class name="rich text format" plural="rich text formats" code="RTFt" 
hidden="yes"
+            description="Rich text format, encoding rich text.">
+            <cocoa class="SKRichTextFormat"/>
+            <property name="name" code="pnam" type="text" access="r"
+                description="The name for the rich text format.">
+                <cocoa key="name"/>
+            </property>
+            <contents name="text" code="ctxt" type="rich text" access="r"
+                description="The rich text representation of the rich text 
format.">
+                <cocoa key="richText"/>
+            </contents>
+        </class>
+
         <record-type name="PDF view settings" code="VSet">
             <property name="scale factor" code="SclF" type="real"
                 description="The scale factor of the PDF.">
@@ -1308,7 +1312,7 @@
         </command>
 
         <command name="get text for" code="SKIMText"
-            description="Get the text of a document, page, note, or 
selection.">
+            description="Get the text of a document, page, note, selection, or 
raw RTF data.">
             <synonym name="text for"/>
             <cocoa class="SKTextCommand"/>
             <direct-parameter
@@ -1317,34 +1321,16 @@
                 <type type="page"/>
                 <type type="note"/>
                 <type type="specifier" list="yes"/>
+                <type type="any"/>
             </direct-parameter>
             <parameter name="on" type="page" code="on  " optional="yes"
                 description="The page on which to get the text.">
                 <cocoa key="Page"/>
             </parameter>
-            <result type="text"
-                description="The text of the object."/>
+            <result type="specifier"
+                description="The rich text of the object."/>
         </command>
 
-        <command name="get RTF for" code="SKIMRTFt"
-            description="Get RTF data for the text of a document, page, note, 
or selection.">
-            <synonym name="RTF for"/>
-            <cocoa class="SKRTFCommand"/>
-            <direct-parameter
-                description="The document, page, note or selection.">
-                <type type="document"/>
-                <type type="page"/>
-                <type type="note"/>
-                <type type="specifier" list="yes"/>
-            </direct-parameter>
-            <parameter name="on" type="page" code="on  " optional="yes"
-                description="The page on which to get the text.">
-                <cocoa key="Page"/>
-            </parameter>
-            <result type="any"
-                description="RTF data for the text of the object."/>
-        </command>
-
         <command name="get index for" code="SKIMIndx"
             description="Get the index of a document, page, note, or 
selection.">
             <cocoa class="SKIndexCommand"/>

Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj        2009-01-17 22:29:12 UTC (rev 
5128)
+++ trunk/Skim.xcodeproj/project.pbxproj        2009-01-19 15:50:06 UTC (rev 
5129)
@@ -116,7 +116,6 @@
                CE4EC87F0B7E6E110091F228 /* NSBezierPath_CoreImageExtensions.m 
in Sources */ = {isa = PBXBuildFile; fileRef = CE4EC87E0B7E6E110091F228 /* 
NSBezierPath_CoreImageExtensions.m */; };
                CE4EC8830B7E6E920091F228 /* CIImage_BDSKExtensions.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = CE4EC8820B7E6E920091F228 /* 
CIImage_BDSKExtensions.m */; };
                CE4EC88C0B7E6EDB0091F228 /* SKSplitView.m in Sources */ = {isa 
= PBXBuildFile; fileRef = CE4EC88B0B7E6EDB0091F228 /* SKSplitView.m */; };
-               CE4EDE3A0F0538B700447C6A /* SKRTFCommand.m in Sources */ = {isa 
= PBXBuildFile; fileRef = CE4EDE390F0538B700447C6A /* SKRTFCommand.m */; };
                CE4F9DEE0BC1BE3A005BE0A1 /* Localizable.strings in Resources */ 
= {isa = PBXBuildFile; fileRef = CE4F9DEC0BC1BE3A005BE0A1 /* 
Localizable.strings */; };
                CE51630B0EAB5A1A009FA237 /* SKSegmentedControl.m in Sources */ 
= {isa = PBXBuildFile; fileRef = CE5163090EAB5A1A009FA237 /* 
SKSegmentedControl.m */; };
                CE5163380EAB5EE2009FA237 /* Segment_Cap.tiff in Resources */ = 
{isa = PBXBuildFile; fileRef = CE51632C0EAB5EE2009FA237 /* Segment_Cap.tiff */; 
};
@@ -203,6 +202,7 @@
                CEB735A20C4A8CD6000350F9 /* TransitionShading.tiff in Resources 
*/ = {isa = PBXBuildFile; fileRef = CEB735A10C4A8CD6000350F9 /* 
TransitionShading.tiff */; };
                CEBD52ED0C9C0AE500FBF6A4 /* SKBookmark.m in Sources */ = {isa = 
PBXBuildFile; fileRef = CEBD52EB0C9C0AE500FBF6A4 /* SKBookmark.m */; };
                CEBF85E20CCE2DE70057A050 /* NSAffineTransform_SKExtensions.m in 
Sources */ = {isa = PBXBuildFile; fileRef = CEBF85E00CCE2DE70057A050 /* 
NSAffineTransform_SKExtensions.m */; };
+               CEC3154F0F24AC02008D2C75 /* SKRichTextFormat.m in Sources */ = 
{isa = PBXBuildFile; fileRef = CEC3154E0F24AC02008D2C75 /* SKRichTextFormat.m 
*/; };
                CEC3AD240E23EC0300F40B0B /* PDFAnnotationLink_SKExtensions.m in 
Sources */ = {isa = PBXBuildFile; fileRef = CEC3AD230E23EC0300F40B0B /* 
PDFAnnotationLink_SKExtensions.m */; };
                CEC7B39A0CF5F2D2008CCD63 /* AppleRemote.m in Sources */ = {isa 
= PBXBuildFile; fileRef = CEC7B38E0CF5F2D2008CCD63 /* AppleRemote.m */; };
                CEC7B39C0CF5F2D2008CCD63 /* GlobalKeyboardDevice.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = CEC7B3900CF5F2D2008CCD63 /* 
GlobalKeyboardDevice.m */; };
@@ -611,8 +611,6 @@
                CE4EC8820B7E6E920091F228 /* CIImage_BDSKExtensions.m */ = {isa 
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; 
path = CIImage_BDSKExtensions.m; sourceTree = "<group>"; };
                CE4EC88A0B7E6EDB0091F228 /* SKSplitView.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
SKSplitView.h; sourceTree = "<group>"; };
                CE4EC88B0B7E6EDB0091F228 /* SKSplitView.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= SKSplitView.m; sourceTree = "<group>"; };
-               CE4EDE380F0538B700447C6A /* SKRTFCommand.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
SKRTFCommand.h; sourceTree = "<group>"; };
-               CE4EDE390F0538B700447C6A /* SKRTFCommand.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= SKRTFCommand.m; sourceTree = "<group>"; };
                CE4F96AE0CFB49B100DBEA14 /* ru */ = {isa = PBXFileReference; 
lastKnownFileType = wrapper.nib; name = ru; path = ru.lproj/InfoWindow.nib; 
sourceTree = "<group>"; };
                CE4F96B20CFB49C200DBEA14 /* ru */ = {isa = PBXFileReference; 
lastKnownFileType = wrapper.nib; name = ru; path = ru.lproj/MainMenu.nib; 
sourceTree = "<group>"; };
                CE4F96B80CFB49D700DBEA14 /* ru */ = {isa = PBXFileReference; 
lastKnownFileType = wrapper.nib; name = ru; path = ru.lproj/NoteWindow.nib; 
sourceTree = "<group>"; };
@@ -822,6 +820,8 @@
                CEBD52EB0C9C0AE500FBF6A4 /* SKBookmark.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= SKBookmark.m; sourceTree = "<group>"; };
                CEBF85DF0CCE2DE70057A050 /* NSAffineTransform_SKExtensions.h */ 
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.h; path = NSAffineTransform_SKExtensions.h; sourceTree = 
"<group>"; };
                CEBF85E00CCE2DE70057A050 /* NSAffineTransform_SKExtensions.m */ 
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; path = NSAffineTransform_SKExtensions.m; sourceTree = 
"<group>"; };
+               CEC3154D0F24AC02008D2C75 /* SKRichTextFormat.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
SKRichTextFormat.h; sourceTree = "<group>"; };
+               CEC3154E0F24AC02008D2C75 /* SKRichTextFormat.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= SKRichTextFormat.m; sourceTree = "<group>"; };
                CEC3AD220E23EC0300F40B0B /* PDFAnnotationLink_SKExtensions.h */ 
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.h; path = PDFAnnotationLink_SKExtensions.h; sourceTree = 
"<group>"; };
                CEC3AD230E23EC0300F40B0B /* PDFAnnotationLink_SKExtensions.m */ 
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; path = PDFAnnotationLink_SKExtensions.m; sourceTree = 
"<group>"; };
                CEC4C33C0CA90CA100299397 /* Spanish */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.nib; name = Spanish; path = 
Spanish.lproj/BookmarkSheet.nib; sourceTree = "<group>"; };
@@ -1364,20 +1364,22 @@
                                CEAA8EF60EA2A14700C16FE4 /* SKNote.m */,
                                CEAA8F2C0EA2A86200C16FE4 /* SKNoteText.h */,
                                CEAA8F2D0EA2A86200C16FE4 /* SKNoteText.m */,
+                               CEE54DEF0DA2EF0E0037169F /* 
SKPDFAnnotationTemporary.h */,
+                               CEE54DF00DA2EF0E0037169F /* 
SKPDFAnnotationTemporary.m */,
+                               CE3366DD0E28BCFA005F99E6 /* SKPDFSyncRecord.h 
*/,
+                               CE3366DE0E28BCFA005F99E6 /* SKPDFSyncRecord.m 
*/,
+                               CE2896D80E78948200031EEA /* SKPDFOutline.h */,
+                               CE2896D90E78948200031EEA /* SKPDFOutline.m */,
                                CE4294A10BBD29120016FDC2 /* SKReadingBar.h */,
                                CE4294A20BBD29120016FDC2 /* SKReadingBar.m */,
+                               CEC3154D0F24AC02008D2C75 /* SKRichTextFormat.h 
*/,
+                               CEC3154E0F24AC02008D2C75 /* SKRichTextFormat.m 
*/,
                                CE2DE4900B85D48F00D0DA12 /* SKThumbnail.h */,
                                CE2DE4910B85D48F00D0DA12 /* SKThumbnail.m */,
+                               CE8978CB0CBFC70B00EA2D98 /* SKTemplateTag.h */,
+                               CE8978CC0CBFC70B00EA2D98 /* SKTemplateTag.m */,
                                CEF7117C0B90B58E003A2771 /* SKVersionNumber.h 
*/,
                                CEF7117D0B90B58E003A2771 /* SKVersionNumber.m 
*/,
-                               CE8978CB0CBFC70B00EA2D98 /* SKTemplateTag.h */,
-                               CE8978CC0CBFC70B00EA2D98 /* SKTemplateTag.m */,
-                               CEE54DEF0DA2EF0E0037169F /* 
SKPDFAnnotationTemporary.h */,
-                               CEE54DF00DA2EF0E0037169F /* 
SKPDFAnnotationTemporary.m */,
-                               CE3366DD0E28BCFA005F99E6 /* SKPDFSyncRecord.h 
*/,
-                               CE3366DE0E28BCFA005F99E6 /* SKPDFSyncRecord.m 
*/,
-                               CE2896D80E78948200031EEA /* SKPDFOutline.h */,
-                               CE2896D90E78948200031EEA /* SKPDFOutline.m */,
                        );
                        name = Data;
                        sourceTree = "<group>";
@@ -1435,8 +1437,6 @@
                                CE4643CE0DF6B5A400CFD8D2 /* SKJoinCommand.m */,
                                CE4643D30DF6B60500CFD8D2 /* SKPagesCommand.h */,
                                CE4643D40DF6B60500CFD8D2 /* SKPagesCommand.m */,
-                               CE4EDE380F0538B700447C6A /* SKRTFCommand.h */,
-                               CE4EDE390F0538B700447C6A /* SKRTFCommand.m */,
                                CE4643D60DF6B63500CFD8D2 /* SKTextCommand.h */,
                                CE4643D70DF6B63500CFD8D2 /* SKTextCommand.m */,
                        );
@@ -2156,8 +2156,8 @@
                                CED6A3120EADF37800E8CD11 /* 
NSImageCell_SKExtensions.m in Sources */,
                                CEE0F5EB0EBB3DEC000A7A8C /* 
SKLevelIndicatorCell.m in Sources */,
                                CE0A3C8E0EBF3AAA00526C74 /* 
NSResponder_SKExtensions.m in Sources */,
-                               CE4EDE3A0F0538B700447C6A /* SKRTFCommand.m in 
Sources */,
                                CE17F47E0F1A17E200E741DD /* 
SKPDFSynchronizerServer.m in Sources */,
+                               CEC3154F0F24AC02008D2C75 /* SKRichTextFormat.m 
in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


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

------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to