gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 13:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added method [RTFConsumer appendString:] with code coming from

Browse source 
GSRTFmangleText(). Use this in GSRTFmangleText() and new function
GSRTFunicode(). Corrected GSRTFmangleText() to convert the input
from NSISOLatin1StringEncoding, as this is what our current RTF
exporter produces.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17224 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2003-07-15 22:18:01 +00:00
parent 2e33809a42
commit 76debd3f89
1 changed files with 69 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
TextConverters/RTF/RTFConsumer.m
View file

@ -265,6 +265,7 @@ static BOOL classInheritsFromNSMutableAttributedString (Class c)
- (RTFAttribute*) attr;
- (void) push;
- (void) pop;
- (void) appendString: (NSString*)string;
@end
@ -490,6 +491,57 @@ static BOOL classInheritsFromNSMutableAttributedString (Class c)
}
}
- (void) appendString: (NSString*)string
{
int oldPosition = [result length];
int textlen = [string length];
NSRange insertionRange = NSMakeRange(oldPosition,0);
NSMutableDictionary *attributes;
if (!ignore && textlen)
{
RTFAttribute* attr = [self attr];
[result replaceCharactersInRange: insertionRange
withString: string];
if (attr->changed)
{
NSParagraphStyle *ps = [attr->paragraph copy];
attributes = [[NSMutableDictionary alloc]
initWithObjectsAndKeys:
[attr currentFont], NSFontAttributeName,
ps, NSParagraphStyleAttributeName,
nil];
DESTROY(ps);
if (attr->underline)
{
[attributes setObject: [attr underline]
forKey: NSUnderlineStyleAttributeName];
}
if (attr->script)
{
[attributes setObject: [attr script]
forKey: NSSuperscriptAttributeName];
}
if (attr->fgColour != nil)
{
[attributes setObject: attr->fgColour
forKey: NSForegroundColorAttributeName];
}
if (attr->bgColour != nil)
{
[attributes setObject: attr->bgColour
forKey: NSBackgroundColorAttributeName];
}
[result setAttributes: attributes
range: NSMakeRange(oldPosition, textlen)];
DESTROY(attributes);
attr->changed = NO;
}
}
}
@end
#undef IGNORE
@ -577,54 +629,23 @@ void GSRTFcloseBlock (void *ctxt, BOOL ignore)
void GSRTFmangleText (void *ctxt, const char *text)
{
int oldPosition = TEXTPOSITION;
int textlen = strlen(text);
NSRange insertionRange = NSMakeRange(oldPosition,0);
NSMutableDictionary *attributes;
NSData *data = [[NSData alloc] initWithBytes: (void*)text
length: strlen(text)];
NSString *str = [[NSString alloc] initWithData: data
encoding: NSISOLatin1StringEncoding];
if (!IGNORE && textlen)
{
NSString *str = [[NSString alloc] initWithCString: text];
[RESULT replaceCharactersInRange: insertionRange
withString: str];
DESTROY(str);
[(RTFConsumer *)ctxt appendString: str];
DESTROY(str);
DESTROY(data);
}
if (CHANGED)
{
NSParagraphStyle *ps = [PARAGRAPH copy];
attributes = [[NSMutableDictionary alloc]
initWithObjectsAndKeys:
[CTXT currentFont], NSFontAttributeName,
ps, NSParagraphStyleAttributeName,
nil];
DESTROY(ps);
if (UNDERLINE)
{
[attributes setObject: [CTXT underline]
forKey: NSUnderlineStyleAttributeName];
}
if (SCRIPT)
{
[attributes setObject: [CTXT script]
forKey: NSSuperscriptAttributeName];
}
if (FGCOLOUR != nil)
{
[attributes setObject: FGCOLOUR
forKey: NSForegroundColorAttributeName];
}
if (BGCOLOUR != nil)
{
[attributes setObject: BGCOLOUR
forKey: NSBackgroundColorAttributeName];
}
[RESULT setAttributes: attributes
range: NSMakeRange(oldPosition, textlen)];
DESTROY(attributes);
CHANGED = NO;
}
}
void GSRTFunicode (void *ctxt, int uchar)
{
unichar chars = uchar;
NSString *str = [[NSString alloc] initWithCharacters: &chars
length: 1];
[(RTFConsumer *)ctxt appendString: str];
DESTROY(str);
}
void GSRTFregisterFont (void *ctxt, const char *fontName,
@ -930,7 +951,7 @@ void GSRTFaddDefaultColor (void *ctxt)
void GSRTFcolorbg (void *ctxt, int color)
{
if ([COLOURS count] <= color)
if ([COLOURS count] <= (unsigned int)color)
{
ASSIGN (BGCOLOUR, [NSColor whiteColor]);
}
@ -943,7 +964,7 @@ void GSRTFcolorbg (void *ctxt, int color)
void GSRTFcolorfg (void *ctxt, int color)
{
if ([COLOURS count] <= color)
if ([COLOURS count] <= (unsigned int)color)
{
ASSIGN (FGCOLOUR, [NSColor blackColor]);
}