gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSAttributedString.m: Implement keyed decoding for

Browse source 
multiple attributes correctly.
  Based on code by Nikolaus Schaller <hns@computer.org>.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29645 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2010-02-15 13:58:03 +00:00
parent c4e1e08185
commit cc2aa7c169
2 changed files with 89 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-02-15 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSAttributedString.m: Implement keyed decoding for
multiple attributes correctly.
Based on code by Nikolaus Schaller <hns@computer.org>.
2010-02-14 David Chisnall <theraven@sucs.org>
Rewrote NSNumber implementation.

87
Source/NSAttributedString.m
View file

@ -52,6 +52,7 @@
#import "GNUstepBase/Unicode.h"
#import "Foundation/NSAttributedString.h"
#import "Foundation/NSData.h"
#import "Foundation/NSException.h"
#import "Foundation/NSAutoreleasePool.h"
#import "Foundation/NSPortCoder.h"
@ -160,6 +161,7 @@ static Class GSMutableAttributedStringClass;
{
NSDictionary *attrs;
// FIXME: This doesn't handle the case of different attributes
attrs = [self attributesAtIndex: 0 effectiveRange: NULL];
[aCoder encodeObject: attrs forKey: @"NSAttributes"];
@ -189,9 +191,50 @@ static Class GSMutableAttributedStringClass;
if ([aDecoder allowsKeyedCoding])
{
NSString *string = [aDecoder decodeObjectForKey: @"NSString"];
NSDictionary *attributes = [aDecoder decodeObjectForKey: @"NSAttributes"];
self = [self initWithString: string attributes: attributes];
if (![aDecoder containsValueForKey: @"NSAttributeInfo"])
{
NSDictionary *attributes = [aDecoder decodeObjectForKey: @"NSAttributes"];
self = [self initWithString: string attributes: attributes];
}
else
{
NSArray *attributes = [aDecoder decodeObjectForKey: @"NSAttributes"];
NSData *info = [aDecoder decodeObjectForKey: @"NSAttributeInfo"];
unsigned int pos = 0;
const unsigned char *p = [info bytes];
const unsigned char *end = p + [info length];
NSMutableAttributedString *m = [[NSMutableAttributedString alloc]
initWithString: string
attributes: nil];
while (p < end)
{
unsigned int idx;
unsigned int len;
NSRange r;
// FIXME: For huge strings we may need more bytes
len = *p++;
if (len & 0x8)
{
len = (len - 128) + ((*p++) << 7);
}
idx = *p++;
if (idx & 0x8)
{
idx = (idx - 128) + ((*p++) << 7);
}
r = NSMakeRange(pos, len);
[m setAttributes: [attributes objectAtIndex: idx] range: r];
pos = NSMaxRange(r);
}
RELEASE(self);
self = [m copy];
RELEASE(m);
}
}
else
{
@ -646,9 +689,45 @@ static Class GSMutableAttributedStringClass;
if ([aDecoder allowsKeyedCoding])
{
NSString *string = [aDecoder decodeObjectForKey: @"NSString"];
NSDictionary *attributes = [aDecoder decodeObjectForKey: @"NSAttributes"];
self = [self initWithString: string attributes: attributes];
if (![aDecoder containsValueForKey: @"NSAttributeInfo"])
{
NSDictionary *attributes = [aDecoder decodeObjectForKey: @"NSAttributes"];
self = [self initWithString: string attributes: attributes];
}
else
{
NSArray *attributes = [aDecoder decodeObjectForKey: @"NSAttributes"];
NSData *info = [aDecoder decodeObjectForKey: @"NSAttributeInfo"];
unsigned int pos = 0;
const unsigned char *p = [info bytes];
const unsigned char *end = p + [info length];
self = [self initWithString: string attributes: nil];
while (p < end)
{
unsigned int idx;
unsigned int len;
NSRange r;
// FIXME: For huge strings we may need more bytes
len = *p++;
if (len & 0x8)
{
len = (len - 128) + ((*p++) << 7);
}
idx = *p++;
if (idx & 0x8)
{
idx = (idx - 128) + ((*p++) << 7);
}
r = NSMakeRange(pos, len);
[self setAttributes: [attributes objectAtIndex: idx] range: r];
pos = NSMaxRange(r);
}
}
}
else
{