rendering variation sequences (for Win,MAC only)

modules/javafx.graphics/src/main/java/com/sun/javafx/text/ScriptMapper.java

@@ -24,6 +24,7 @@
  */
 
 package com.sun.javafx.text;
+import com.sun.javafx.PlatformUtil;
 
 public class ScriptMapper {
 
@@ -80,7 +81,8 @@ public static synchronized int getScript(int codePoint) {
      * in the case where the caller interprets 'layout' to mean where
      * one 'char' (ie the java type char) does not map to one glyph
      */
-    private static final int MAX_LAYOUT_CHARCODE = 0x206F;
+    private static final int MAX_LAYOUT_CHARCODE
+     = (PlatformUtil.isWindows() || PlatformUtil.isMac()) ? 0xE01EF : 0x206F;
 
     /* If the character code falls into any of a number of unicode ranges
      * where we know that simple left->right layout mapping chars to glyphs
@@ -166,6 +168,14 @@ else if (code >= 0x202a && code <= 0x202e) { // directional control
         else if (code >= 0x206a && code <= 0x206f) { // directional control
             return true;
         }
+        else if (code >= 0xfe00 && code <= 0xfe0f) {
+            // SVS (Standardized Variation Sequence)
+            return true;
+        }
+        else if (code >= 0xe0100 && code <= 0xe01ef) {
+            // IVS (Ideographic Variation Sequence)
+            return true;
+        }
         return false;
     }
 

tests/manual/text/VariationSelectorsTest.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javafx.application.Application;
+import static javafx.application.Application.launch;
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.layout.VBox;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+import javafx.stage.Stage;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+
+public class VariationSelectorsTest extends Application {
+
+    public void start(Stage stage) {
+        final String fontName = "ipaexm.ttf";
+        // download from https://ipafont.ipa.go.jp/node26#en
+        // and place in {user.home}/fonts/
+
+        final String base = System.getProperty("user.home")+"/fonts/";
+        Font font = Font.loadFont("file://"+base+fontName, 48);
+        if (font == null || !"IPAexMincho".equals(font.getName())) {
+            System.err.println("# You need to place "+fontName+" in "+base);
+            System.exit(0);
+        }
+
+        stage.setWidth(260);
+        stage.setHeight(150);
+        Group g = new Group();
+        final Scene scene = new Scene(new Group());
+        VBox box = new VBox();
+        ((Group)scene.getRoot()).getChildren().add(box);
+        stage.setScene(scene);
+
+        Text txt = new Text("\u845b\udb40\udd00\u845b\udb40\udd01");
+        txt.setFont(font);
+        box.getChildren().add(txt);
+
+        Image img = new Image("VariationSelectorsTest_Expected.png");
+        ImageView iv = new ImageView();
+        iv.setImage(img);
+        box.getChildren().add(iv);
+
+        stage.show();
+    }
+}