equal
deleted
inserted
replaced
1122 font2D.getMapper().charsToGlyphs(count, text, glyphs); |
1122 font2D.getMapper().charsToGlyphs(count, text, glyphs); |
1123 } |
1123 } |
1124 |
1124 |
1125 private void initFontData() { |
1125 private void initFontData() { |
1126 font2D = FontUtilities.getFont2D(font); |
1126 font2D = FontUtilities.getFont2D(font); |
|
1127 if (font2D instanceof FontSubstitution) { |
|
1128 font2D = ((FontSubstitution)font2D).getCompositeFont2D(); |
|
1129 } |
1127 float s = font.getSize2D(); |
1130 float s = font.getSize2D(); |
1128 if (font.isTransformed()) { |
1131 if (font.isTransformed()) { |
1129 ftx = font.getTransform(); |
1132 ftx = font.getTransform(); |
1130 if (ftx.getTranslateX() != 0 || ftx.getTranslateY() != 0) { |
1133 if (ftx.getTranslateX() != 0 || ftx.getTranslateY() != 0) { |
1131 addFlags(FLAG_HAS_POSITION_ADJUSTMENTS); |
1134 addFlags(FLAG_HAS_POSITION_ADJUSTMENTS); |
1740 tx, |
1743 tx, |
1741 sgv.font.getStyle(), |
1744 sgv.font.getStyle(), |
1742 aa, fm); |
1745 aa, fm); |
1743 // Get the strike via the handle. Shouldn't matter |
1746 // Get the strike via the handle. Shouldn't matter |
1744 // if we've invalidated the font but its an extra precaution. |
1747 // if we've invalidated the font but its an extra precaution. |
1745 FontStrike strike = sgv.font2D.handle.font2D.getStrike(desc); // !!! getStrike(desc, false) |
1748 // do we want the CompFont from CFont here ? |
|
1749 Font2D f2d = sgv.font2D; |
|
1750 if (f2d instanceof FontSubstitution) { |
|
1751 f2d = ((FontSubstitution)f2d).getCompositeFont2D(); |
|
1752 } |
|
1753 FontStrike strike = f2d.handle.font2D.getStrike(desc); // !!! getStrike(desc, false) |
1746 |
1754 |
1747 return new GlyphStrike(sgv, strike, dx, dy); |
1755 return new GlyphStrike(sgv, strike, dx, dy); |
1748 } |
1756 } |
1749 |
1757 |
1750 private GlyphStrike(StandardGlyphVector sgv, FontStrike strike, float dx, float dy) { |
1758 private GlyphStrike(StandardGlyphVector sgv, FontStrike strike, float dx, float dy) { |