infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-26 02:00:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

8170552: [macosx] Wrong rendering of diacritics on macOS

Browse Source 
Reviewed-by: prr, vadim
This commit is contained in:
Dmitry Batrak 2017-02-15 00:16:49 +03:00
parent 7ebe8fa0fa
commit d12dcc701f
2 changed files with 69 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jdk/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java
View File

@ -75,37 +75,9 @@ public class CCharToGlyphMapper extends CharToGlyphMapper {
}
}
if (code < 0x0590) {
if (code < FontUtilities.MIN_LAYOUT_CHARCODE) {
continue;
} else if (code <= 0x05ff) {
// Hebrew 0x0590->0x05ff
return true;
} else if (code >= 0x0600 && code <= 0x06ff) {
// Arabic
return true;
} else if (code >= 0x0900 && code <= 0x0d7f) {
// if Indic, assume shaping for conjuncts, reordering:
// 0900 - 097F Devanagari
// 0980 - 09FF Bengali
// 0A00 - 0A7F Gurmukhi
// 0A80 - 0AFF Gujarati
// 0B00 - 0B7F Oriya
// 0B80 - 0BFF Tamil
// 0C00 - 0C7F Telugu
// 0C80 - 0CFF Kannada
// 0D00 - 0D7F Malayalam
return true;
} else if (code >= 0x0e00 && code <= 0x0e7f) {
// if Thai, assume shaping for vowel, tone marks
return true;
} else if (code >= 0x200c && code <= 0x200d) {
// zwj or zwnj
return true;
} else if (code >= 0x202a && code <= 0x202e) {
// directional control
return true;
} else if (code >= 0x206a && code <= 0x206f) {
// directional control
} else if (FontUtilities.isComplexCharCode(code)) {
return true;
} else if (code >= 0x10000) {
i += 1; // Empty glyph slot after surrogate

67
jdk/test/java/awt/font/TextLayout/DiacriticsDrawingTest.java Normal file
View File

@ -0,0 +1,67 @@
/*
* Copyright 2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* @test
* @bug 8170552
* @summary verify enabling text layout for complex text on macOS
* @requires os.family == "mac"
*/
import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.image.BufferedImage;
public class DiacriticsDrawingTest {
private static final Font FONT = new Font("Menlo", Font.PLAIN, 12);
private static final int IMAGE_WIDTH = 20;
private static final int IMAGE_HEIGHT = 20;
private static final int TEXT_X = 5;
private static final int TEXT_Y = 15;
public static void main(String[] args) {
BufferedImage composed = drawString("\u00e1"); // latin small letter a with acute
BufferedImage decomposed = drawString("a\u0301"); // same letter in decomposed form
if (!imagesAreEqual(composed, decomposed)) {
throw new RuntimeException("Text rendering is supposed to be the same");
}
}
private static BufferedImage drawString(String text) {
BufferedImage image = new BufferedImage(IMAGE_WIDTH, IMAGE_HEIGHT, BufferedImage.TYPE_INT_RGB);
Graphics g = image.createGraphics();
g.setColor(Color.white);
g.fillRect(0, 0, IMAGE_WIDTH, IMAGE_HEIGHT);
g.setColor(Color.black);
g.setFont(FONT);
g.drawString(text, TEXT_X, TEXT_Y);
g.dispose();
return image;
}
private static boolean imagesAreEqual(BufferedImage i1, BufferedImage i2) {
if (i1.getWidth() != i2.getWidth() || i1.getHeight() != i2.getHeight()) return false;
for (int i = 0; i < i1.getWidth(); i++) {
for (int j = 0; j < i1.getHeight(); j++) {
if (i1.getRGB(i, j) != i2.getRGB(i, j)) {
return false;
}
}
}
return true;
}
}