gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 16:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[runStringForString:attributes:paragraphStart:] Improved output of

Browse source 
bold/italic formating.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7242 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
FredKiefer 2000-08-24 22:55:49 +00:00
parent 0fcde31c72
commit 093280f8d8
1 changed files with 29 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

79
Source/Parsers/RTFProducer.m
View file

@ -49,50 +49,6 @@
documentAttributes: (NSDictionary*)dict;
@end
@interface NSString (Replacing)
- (NSString*) stringByReplacingEveryOccurrenceOfString: (NSString*)aString
withString: (NSString*)other;
@end
@implementation NSString (Replacing)
- (NSString*) stringByReplacingEveryOccurrenceOfString: (NSString*)aString
withString: (NSString*)other
{
unsigned len = [self length];
NSMutableString *erg = [NSMutableString string];
NSRange currRange = [self rangeOfString: aString];
unsigned prevLocation = 0;
while (currRange.length > 0)
{
if (currRange.location > 0)
{
NSRange r;
r = NSMakeRange(prevLocation, currRange.location - prevLocation);
[erg appendString: [self substringWithRange: r]];
}
[erg appendString: other];
currRange.location += currRange.length;
currRange.length = len - currRange.location;
prevLocation = currRange.location;
currRange = [self rangeOfString: aString
options: NSLiteralSearch
range: currRange];
}
if (prevLocation < len)
{
NSRange r;
r = NSMakeRange(prevLocation, len - prevLocation);
[erg appendString: [self substringWithRange: r]];
}
return erg;
}
@end
@implementation RTFProducer
+ (NSFileWrapper*) produceRTFD: (NSAttributedString*) aText
@ -194,6 +150,7 @@
NSString *fontFamily;
NSString *detail;
// If we ever have more fonts to map to families, we should use a dictionary
if ([currFont isEqualToString: @"Symbol"])
fontFamily = @"tech";
else if ([currFont isEqualToString: @"Helvetica"])
@ -476,11 +433,17 @@
NSFont *font;
NSString *fontName;
NSFontTraitMask traits;
NSFontTraitMask oldTraits;
font = [attributes objectForKey: NSFontAttributeName];
fontName = [font familyName];
traits = [[NSFontManager sharedFontManager] traitsOfFont: font];
if (currentFont == nil)
oldTraits = 0;
else
oldTraits = [[NSFontManager sharedFontManager] traitsOfFont: currentFont];
/*
* font name
*/
@ -504,15 +467,31 @@
/*
* font attributes
*/
if (traits & NSItalicFontMask)
if ((traits & NSItalicFontMask) != (oldTraits & NSItalicFontMask))
{
[headerString appendString: @"\\i"];
[trailerString appendString: @"\\i0"];
if (traits & NSItalicFontMask)
{
[headerString appendString: @"\\i"];
[trailerString appendString: @"\\i0"];
}
else
{
[headerString appendString: @"\\i0"];
[trailerString appendString: @"\\i"];
}
}
if (traits & NSBoldFontMask)
if ((traits & NSBoldFontMask) != (oldTraits & NSBoldFontMask))
{
[headerString appendString: @"\\b"];
[trailerString appendString: @"\\b0"];
if (traits & NSBoldFontMask)
{
[headerString appendString: @"\\b"];
[trailerString appendString: @"\\b0"];
}
else
{
[headerString appendString: @"\\b0"];
[trailerString appendString: @"\\b"];
}
}
if (first)