gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 22:40:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source\NSAttributedString.m (-fixFontAttributeInRange:): In

Browse source 
* the
        absence of a NSFontAttributeName attribute, use a default font
to
        prevent the substitution from stopping. This fixes a bug where
        unicode characters would not get the proper font substitution.
        Patch by: Frank Le Grand <frank.legrand@testplant.com>



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@37027 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2013-08-30 15:30:22 +00:00
parent 23d7de30cb
commit 2767d3548e
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2013-08-30 Fred Kiefer <FredKiefer@gmx.de>
* Source\NSAttributedString.m (-fixFontAttributeInRange:): In the
absence of a NSFontAttributeName attribute, use a default font to
prevent the substitution from stopping. This fixes a bug where
unicode characters would not get the proper font substitution.
Patch by: Frank Le Grand <frank.legrand@testplant.com>
2013-08-30 Fred Kiefer <FredKiefer@gmx.de> 2013-08-30 Fred Kiefer <FredKiefer@gmx.de>
* Headers/Additions/GNUstepGUI/GSDisplayServer.h * Headers/Additions/GNUstepGUI/GSDisplayServer.h

10
Source/NSAttributedString.m
View file

@ -1596,6 +1596,16 @@ static NSMutableDictionary *cachedCSets = nil;
font = [self attribute: NSFontAttributeName font = [self attribute: NSFontAttributeName
atIndex: i atIndex: i
effectiveRange: &fontRange]; effectiveRange: &fontRange];
/* If we don't have an attribute for NSFontAttributeName,
** we take a default font so we can carry on with the
** substitution.
*/
if (nil == font)
{
font = [NSFont userFontOfSize:0.0];
}
charset = [font coveredCharacterSet]; charset = [font coveredCharacterSet];
} }