TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

support cedilla and tilde better with caps-only font like MickeyFont

Browse Source
This commit is contained in:
David Rose 2004-09-14 23:56:15 +00:00
parent 0351def3e9
commit e66ecf58d3
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/text/textAssembler.cxx
View File

@ -1067,8 +1067,6 @@ tack_on_accent(UnicodeLatinMap::AccentType accent_type,
tack_on_accent('~', CP_above, CT_none, min_vert, max_vert, centroid, tack_on_accent('~', CP_above, CT_none, min_vert, max_vert, centroid,
properties, placement) || properties, placement) ||
tack_on_accent('s', CP_above, CT_squash_mirror_diag, min_vert, max_vert, centroid, tack_on_accent('s', CP_above, CT_squash_mirror_diag, min_vert, max_vert, centroid,
properties, placement) ||
tack_on_accent('S', CP_above, CT_small_squash_mirror_diag, min_vert, max_vert, centroid,
properties, placement); properties, placement);
break; break;
@ -1123,10 +1121,8 @@ tack_on_accent(UnicodeLatinMap::AccentType accent_type,
case UnicodeLatinMap::AT_cedilla: case UnicodeLatinMap::AT_cedilla:
tack_on_accent('c', CP_bottom, CT_tiny_mirror_x, min_vert, max_vert, centroid, tack_on_accent('c', CP_bottom, CT_tiny_mirror_x, min_vert, max_vert, centroid,
properties, placement); properties, placement);
/* //tack_on_accent(',', CP_bottom, CT_none, min_vert, max_vert, centroid,
tack_on_accent(',', CP_bottom, CT_none, min_vert, max_vert, centroid, // properties, placement);
properties, placement);
*/
break; break;
case UnicodeLatinMap::AT_comma_below: case UnicodeLatinMap::AT_comma_below:
@ -1169,7 +1165,8 @@ tack_on_accent(char accent_mark, TextAssembler::CheesyPosition position,
nassertr(font != (TextFont *)NULL, false); nassertr(font != (TextFont *)NULL, false);
const TextGlyph *accent_glyph; const TextGlyph *accent_glyph;
if (font->get_glyph(accent_mark, accent_glyph)) { if (font->get_glyph(accent_mark, accent_glyph) ||
font->get_glyph(toupper(accent_mark), accent_glyph)) {
PT(Geom) accent_geom = accent_glyph->get_geom(); PT(Geom) accent_geom = accent_glyph->get_geom();
if (accent_geom != (Geom *)NULL) { if (accent_geom != (Geom *)NULL) {
LPoint3f min_accent, max_accent; LPoint3f min_accent, max_accent;