CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/06 10:27:27
Modified files:
. : ChangeLog
lily : open-type-font.cc ttf.cc
scm : define-grob-properties.scm
Log message:
(print_trailer): only define glyph names when
FT_Face has FT_FACE_FLAG_GLYPH_NAMES
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4156&tr2=1.4157&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/open-type-font.cc.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ttf.cc.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grob-properties.scm.diff?tr1=1.122&tr2=1.123&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4156 lilypond/ChangeLog:1.4157
--- lilypond/ChangeLog:1.4156 Wed Oct 5 13:05:44 2005
+++ lilypond/ChangeLog Thu Oct 6 10:27:25 2005
@@ -1,3 +1,8 @@
+2005-10-06 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/ttf.cc (print_trailer): only define glyph names when
+ FT_Face has FT_FACE_FLAG_GLYPH_NAMES
+
2005-10-05 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/horizontal-bracket.cc (make_bracket): new function.
Index: lilypond/lily/open-type-font.cc
diff -u lilypond/lily/open-type-font.cc:1.42
lilypond/lily/open-type-font.cc:1.43
--- lilypond/lily/open-type-font.cc:1.42 Mon Sep 12 12:46:48 2005
+++ lilypond/lily/open-type-font.cc Thu Oct 6 10:27:27 2005
@@ -9,6 +9,7 @@
#include "open-type-font.hh"
#include <cstdio>
+
using namespace std;
#include <freetype/tttables.h>
Index: lilypond/lily/ttf.cc
diff -u lilypond/lily/ttf.cc:1.5 lilypond/lily/ttf.cc:1.6
--- lilypond/lily/ttf.cc:1.5 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/ttf.cc Thu Oct 6 10:27:27 2005
@@ -131,18 +131,22 @@
= (TT_MaxProfile *)FT_Get_Sfnt_Table (face, ft_sfnt_maxp);
lily_cookie_fprintf (out, "/CharStrings %d dict dup begin\n", mp->numGlyphs);
- for (int i = 0; i < mp->numGlyphs; i++)
- {
- FT_Error error = FT_Get_Glyph_Name (face, i, glyph_name, GLYPH_NAME_LEN);
- if (error)
- programming_error ("FT_Get_Glyph_Name() returned error");
- else
- lily_cookie_fprintf (out, "/%s %d def ", glyph_name, i);
- if (! (i % 5))
- lily_cookie_fprintf (out, "\n");
- }
+ if (face->face_flags & FT_FACE_FLAG_GLYPH_NAMES)
+ for (int i = 0; i < mp->numGlyphs; i++)
+ {
+ FT_Error error = FT_Get_Glyph_Name (face, i, glyph_name,
+ GLYPH_NAME_LEN);
+ if (error)
+ programming_error ("print_trailer(): FT_Get_Glyph_Name() returned
error");
+ else
+ lily_cookie_fprintf (out, "/%s %d def ", glyph_name, i);
+
+ if (! (i % 5))
+ lily_cookie_fprintf (out, "\n");
+ }
+
lily_cookie_fprintf (out, "end readonly def\n");
lily_cookie_fprintf (out, "FontName currentdict end definefont pop\n");
}
Index: lilypond/scm/define-grob-properties.scm
diff -u lilypond/scm/define-grob-properties.scm:1.122
lilypond/scm/define-grob-properties.scm:1.123
--- lilypond/scm/define-grob-properties.scm:1.122 Mon Sep 26 23:25:59 2005
+++ lilypond/scm/define-grob-properties.scm Thu Oct 6 10:27:27 2005
@@ -535,6 +535,7 @@
(direction-source ,ly:grob? "in case side-relative-direction is
set, which grob to get the direction from .")
(dot ,ly:grob? "reference to Dots object.")
+ (figures ,ly:grob-array? "Figured bass objects for continuation line.")
(pedal-text ,ly:grob? "Pointer to the text of a mixed-style piano pedal.")
(stem ,ly:grob? "pointer to Stem object.")
(tremolo-flag ,ly:grob? "The tremolo object on a stem.")
@@ -546,14 +547,17 @@
(accidental-grob ,ly:grob? "Accidental for this note.")
(bars ,ly:grob-array? "list of bar line pointers.")
(bounded-by-me ,ly:grob-array? "list of spanners that have this
-column as start/begin point. Only columns that have grobs or act as bounds are
spaced.")
+column as start/begin point. Only columns that have grobs or act as
+bounds are spaced.")
(columns ,ly:grob-array? "list of grobs, typically containing
paper-columns or note-column objects.")
(conditional-elements ,ly:grob-array? "Internal use only")
- (dependencies ,ly:grob-array? "list of score-grob pointers that indicate
who to compute first for certain global passes.")
+ (dependencies ,ly:grob-array? "list of score-grob pointers that indicate
+who to compute first for certain global passes.")
(encompass-objects ,ly:grob-array? "Objects that a slur should avoid
in addition to notes and stems.")
- (elements ,ly:grob-array? "list of grobs, type depending on the Grob
where this is set in.")
+ (elements ,ly:grob-array? "list of grobs, type depending on the Grob
+where this is set in.")
(heads ,ly:grob-array? "List of note heads.")
(items-worth-living ,ly:grob-array? "A list of interesting items. If
empty in a particular staff, then that staff is erased.")
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
