OLD | NEW |
1 /* | 1 /* |
2 This file is part of LilyPond, the GNU music typesetter. | 2 This file is part of LilyPond, the GNU music typesetter. |
3 | 3 |
4 Copyright (C) 2004--2020 Han-Wen Nienhuys <hanwen@xs4all.nl> | 4 Copyright (C) 2004--2020 Han-Wen Nienhuys <hanwen@xs4all.nl> |
5 | 5 |
6 LilyPond is free software: you can redistribute it and/or modify | 6 LilyPond is free software: you can redistribute it and/or modify |
7 it under the terms of the GNU General Public License as published by | 7 it under the terms of the GNU General Public License as published by |
8 the Free Software Foundation, either version 3 of the License, or | 8 the Free Software Foundation, either version 3 of the License, or |
9 (at your option) any later version. | 9 (at your option) any later version. |
10 | 10 |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 } | 229 } |
230 } | 230 } |
231 | 231 |
232 if (ret.empty ()) | 232 if (ret.empty ()) |
233 { | 233 { |
234 warning (_f ("cannot get font %s CFF name", face_ps_name.c_str ())); | 234 warning (_f ("cannot get font %s CFF name", face_ps_name.c_str ())); |
235 ret = face_ps_name; | 235 ret = face_ps_name; |
236 } | 236 } |
237 } | 237 } |
238 | 238 |
239 debug_output (_f ("Replace font name from %s to %s.", | 239 if (face_ps_name != ret) { |
240 face_ps_name.c_str (), ret.c_str ())); | 240 debug_output (_f ("Subsitute font name: %s => %s", |
241 | 241 face_ps_name.c_str (), ret.c_str ())); |
| 242 } |
242 FT_Done_Face (cff_face); | 243 FT_Done_Face (cff_face); |
243 | 244 |
244 return ret; | 245 return ret; |
245 } | 246 } |
246 | 247 |
247 SCM | 248 SCM |
248 Open_type_font::make_otf (const string &str) | 249 Open_type_font::make_otf (const string &str) |
249 { | 250 { |
250 FT_Face face = open_ft_face (str, 0 /* index */); | 251 FT_Face face = open_ft_face (str, 0 /* index */); |
251 Open_type_font *otf = new Open_type_font (face); | 252 Open_type_font *otf = new Open_type_font (face); |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
467 if (code) | 468 if (code) |
468 warning (_f ("FT_Get_Glyph_Name () error: %s", | 469 warning (_f ("FT_Get_Glyph_Name () error: %s", |
469 freetype_error_string (code).c_str ())); | 470 freetype_error_string (code).c_str ())); |
470 | 471 |
471 *tail = scm_cons (scm_from_ascii_string (name), SCM_EOL); | 472 *tail = scm_cons (scm_from_ascii_string (name), SCM_EOL); |
472 tail = SCM_CDRLOC (*tail); | 473 tail = SCM_CDRLOC (*tail); |
473 } | 474 } |
474 | 475 |
475 return retval; | 476 return retval; |
476 } | 477 } |
OLD | NEW |