Skip to content

Commit 543463c

Browse files
authored
Merge pull request #60 from gnustep/NSFontAssetRequest_branch2
Add FCFontAssetInstaller to libs-back...
2 parents bc7a4c2 + 18297a5 commit 543463c

File tree

7 files changed

+403
-0
lines changed

7 files changed

+403
-0
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ Source/config.h
1414
Source/libgnustep*Info.plist
1515
Tools/XGCommonFont.m
1616
Tools/xdnd.c
17+
*~
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
CairoFontAssetInstaller.h
3+
4+
Copyright (C) 2003 Free Software Foundation, Inc.
5+
6+
By: Gregory John Casamento <[email protected]>
7+
Date: October 4, 2025
8+
9+
This file is part of GNUstep.
10+
11+
This library is free software; you can redistribute it and/or
12+
modify it under the terms of the GNU Lesser General Public
13+
License as published by the Free Software Foundation; either
14+
version 2 of the License, or (at your option) any later version.
15+
16+
This library is distributed in the hope that it will be useful,
17+
but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
19+
Lesser General Public License for more details.
20+
21+
You should have received a copy of the GNU Lesser General Public
22+
License along with this library; see the file COPYING.LIB.
23+
If not, see <http://www.gnu.org/licenses/> or write to the
24+
Free Software Foundation, 51 Franklin Street, Fifth Floor,
25+
Boston, MA 02110-1301, USA.
26+
*/
27+
28+
#ifndef CairoFontAssetInstaller_h
29+
#define CairoFontAssetInstaller_h
30+
31+
#include "fontconfig/FCFontAssetInstaller.h"
32+
33+
@interface CairoFontAssetInstaller : FCFontAssetInstaller
34+
@end
35+
36+
#endif
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/* Interface of class FCFontAssetInstaller
2+
Copyright (C) 2024 Free Software Foundation, Inc.
3+
4+
By: Gregory John Casamento <[email protected]>
5+
Date: September 5, 2025
6+
7+
This file is part of the GNUstep Library.
8+
9+
This library is free software; you can redistribute it and/or
10+
modify it under the terms of the GNU Lesser General Public
11+
License as published by the Free Software Foundation; either
12+
version 2.1 of the License, or (at your option) any later version.
13+
14+
This library is distributed in the hope that it will be useful,
15+
but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
Lesser General Public License for more details.
18+
19+
You should have received a copy of the GNU Lesser General Public
20+
License along with this library; if not, write to the Free
21+
Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
22+
Boston, MA 02110 USA.
23+
*/
24+
25+
#ifndef FCFONTASSETINSTALLER_H
26+
#define FCFONTASSETINSTALLER_H
27+
28+
#import <Foundation/NSObject.h>
29+
#import <GNUstepGUI/GSFontAssetInstaller.h>
30+
31+
@interface FCFontAssetInstaller : GSFontAssetInstaller
32+
@end
33+
34+
#endif

Source/cairo/CairoContext.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
#include "cairo/CairoPDFSurface.h"
3737
#include "cairo/CairoFontInfo.h"
3838
#include "cairo/CairoFontEnumerator.h"
39+
#include "cairo/CairoFontAssetInstaller.h"
40+
3941
#include "config.h"
4042

4143
#define CGSTATE ((CairoGState *)gstate)
@@ -88,6 +90,7 @@ + (void) initializeBackend
8890

8991
[GSFontEnumerator setDefaultClass: [CairoFontEnumerator class]];
9092
[GSFontInfo setDefaultClass: [CairoFontInfo class]];
93+
[GSFontAssetInstaller setDefaultClass: [CairoFontAssetInstaller class]];
9194
}
9295

9396
+ (Class) GStateClass
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/* Implementation of class CairoFontAssetInstaller
2+
Copyright (C) 2025 Free Software Foundation, Inc.
3+
4+
By: Gregory John Casamento <[email protected]>
5+
Date: October 4, 2025
6+
7+
This file is part of the GNUstep Library.
8+
9+
This library is free software; you can redistribute it and/or
10+
modify it under the terms of the GNU Lesser General Public
11+
License as published by the Free Software Foundation; either
12+
version 2.1 of the License, or (at your option) any later version.
13+
14+
This library is distributed in the hope that it will be useful,
15+
but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
Lesser General Public License for more details.
18+
19+
You should have received a copy of the GNU Lesser General Public
20+
License along with this library; if not, write to the Free
21+
Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
22+
Boston, MA 02110 USA.
23+
*/
24+
25+
#import <Foundation/Foundation.h>
26+
#import "cairo/CairoFontAssetInstaller.h"
27+
28+
@implementation CairoFontAssetInstaller
29+
@end

Source/cairo/GNUmakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ cairo_OBJC_FILES = CairoSurface.m \
3434
CairoGState.m \
3535
CairoContext.m \
3636
CairoFontEnumerator.m \
37+
CairoFontAssetInstaller.m \
3738
CairoFaceInfo.m \
3839
CairoPSSurface.m \
3940
CairoPDFSurface.m \
4041
../fontconfig/FCFaceInfo.m \
4142
../fontconfig/FCFontEnumerator.m \
4243
../fontconfig/FCFontInfo.m \
44+
../fontconfig/FCFontAssetInstaller.m \
4345

4446

4547
ifeq ($(BUILD_SERVER),x11)

0 commit comments

Comments
 (0)