1040 lines
43 KiB
Java
1040 lines
43 KiB
Java
/**
|
|
*******************************************************************************
|
|
* Copyright (C) 1996-2001, International Business Machines Corporation and *
|
|
* others. All Rights Reserved. *
|
|
*******************************************************************************
|
|
*
|
|
* $Source: /xsrl/Nsvn/icu/unicodetools/com/ibm/text/UCD/GenerateData.java,v $
|
|
* $Date: 2001/10/25 20:33:46 $
|
|
* $Revision: 1.7 $
|
|
*
|
|
*******************************************************************************
|
|
*/
|
|
|
|
package com.ibm.text.UCD;
|
|
|
|
import java.util.*;
|
|
import java.io.*;
|
|
import java.text.DateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
|
import com.ibm.text.utility.*;
|
|
import com.ibm.text.UTF16;
|
|
|
|
|
|
public class GenerateData implements UCD_Types {
|
|
|
|
static UnifiedBinaryProperty ubp;
|
|
|
|
public static void main (String inVersion, String[] args) throws IOException {
|
|
System.out.println("START");
|
|
ucd = UCD.make(inVersion);
|
|
ubp = new UnifiedBinaryProperty(ucd);
|
|
|
|
System.out.println("Loaded UCD " + ucd.getVersion() + " " + (new Date(ucd.getDate())));
|
|
String version = ucd.getVersion();
|
|
|
|
for (int i = 0; i < args.length; ++i) {
|
|
String arg = args[i];
|
|
if (arg.charAt(0) == '#') return; // skip rest of line
|
|
long mask = 0;
|
|
|
|
Utility.fixDot();
|
|
System.out.println("Argument: " + args[i]);
|
|
|
|
if (arg.equalsIgnoreCase("partition")) {
|
|
partitionProperties();
|
|
} else if (arg.equalsIgnoreCase("list")) {
|
|
listProperties();
|
|
} else if (arg.equalsIgnoreCase("listAccents")) {
|
|
listCombiningAccents();
|
|
|
|
} else if (arg.equalsIgnoreCase("listGreekVowels")) {
|
|
listGreekVowels();
|
|
|
|
} else if (arg.equalsIgnoreCase("listKatakana")) {
|
|
listKatakana();
|
|
|
|
} else if (arg.equalsIgnoreCase("diff")) {
|
|
listDifferences();
|
|
} else if (arg.equalsIgnoreCase("DerivedBidiClass")) {
|
|
generateVerticalSlice(BIDI_CLASS, BIDI_CLASS+NEXT_ENUM, KEEP_SPECIAL, HEADER_DERIVED,
|
|
"DerivedBidiClass-" + version );
|
|
|
|
} else if (arg.equalsIgnoreCase("DerivedNormalizationProperties")) {
|
|
mask = Utility.setBits(0, DerivedProperty.FC_NFKC_Closure, DerivedProperty.ExpandsOnNFKC);
|
|
mask = Utility.clearBit(mask, DerivedProperty.FullCompInclusion);
|
|
generateDerived(mask, HEADER_DERIVED, "DerivedNormalizationProperties-" + version );
|
|
|
|
} else if (arg.equalsIgnoreCase("DerivedFullNormalization")) {
|
|
mask = Utility.setBits(0, DerivedProperty.GenNFD, DerivedProperty.GenNFKC);
|
|
generateDerived(mask, HEADER_DERIVED, "DerivedFullNormalization-" + version );
|
|
|
|
} else if (arg.equalsIgnoreCase("DerivedEastAsianWidth")) {
|
|
generateVerticalSlice(EAST_ASIAN_WIDTH, EAST_ASIAN_WIDTH+NEXT_ENUM, KEEP_SPECIAL, HEADER_DERIVED,
|
|
"DerivedEastAsianWidth-" + version );
|
|
} else if (arg.equalsIgnoreCase("DerivedGeneralCategory")) {
|
|
generateVerticalSlice(CATEGORY, CATEGORY+NEXT_ENUM, KEEP_SPECIAL, HEADER_DERIVED,
|
|
"DerivedGeneralCategory-" + version );
|
|
} else if (arg.equalsIgnoreCase("DerivedCombiningClass")) {
|
|
generateVerticalSlice(COMBINING_CLASS, COMBINING_CLASS+NEXT_ENUM, KEEP_SPECIAL, HEADER_DERIVED,
|
|
"DerivedCombiningClass-" + version );
|
|
} else if (arg.equalsIgnoreCase("DerivedDecompositionType")) {
|
|
generateVerticalSlice(DECOMPOSITION_TYPE, DECOMPOSITION_TYPE+NEXT_ENUM, KEEP_SPECIAL, HEADER_DERIVED,
|
|
"DerivedDecompositionType-" + version );
|
|
} else if (arg.equalsIgnoreCase("DerivedNumericType")) {
|
|
generateVerticalSlice(NUMERIC_TYPE, NUMERIC_TYPE+NEXT_ENUM, KEEP_SPECIAL, HEADER_DERIVED,
|
|
"DerivedNumericType-" + version );
|
|
} else if (arg.equalsIgnoreCase("DerivedEastAsianWidth")) {
|
|
generateVerticalSlice(EAST_ASIAN_WIDTH, EAST_ASIAN_WIDTH+NEXT_ENUM, KEEP_SPECIAL, HEADER_DERIVED,
|
|
"DerivedEastAsianWidth-" + version );
|
|
} else if (arg.equalsIgnoreCase("DerivedJoiningType")) {
|
|
generateVerticalSlice(JOINING_TYPE, JOINING_TYPE+NEXT_ENUM, KEEP_SPECIAL, HEADER_DERIVED,
|
|
"DerivedJoiningType-" + version );
|
|
} else if (arg.equalsIgnoreCase("DerivedJoiningGroup")) {
|
|
generateVerticalSlice(JOINING_GROUP, JOINING_GROUP+NEXT_ENUM, KEEP_SPECIAL, HEADER_DERIVED,
|
|
"DerivedJoiningGroup-" + version );
|
|
} else if (arg.equalsIgnoreCase("DerivedBinaryProperties")) {
|
|
generateVerticalSlice(BINARY_PROPERTIES, BINARY_PROPERTIES+1, KEEP_SPECIAL, HEADER_DERIVED,
|
|
"DerivedBinaryProperties-" + version );
|
|
} else if (arg.equalsIgnoreCase("DerivedNumericValues")) {
|
|
generateVerticalSlice(LIMIT_ENUM, LIMIT_ENUM, KEEP_SPECIAL, HEADER_DERIVED,
|
|
"DerivedNumericValues-" + version );
|
|
|
|
} else if (arg.equalsIgnoreCase("DerivedCoreProperties")) {
|
|
mask = Utility.setBits(0, DerivedProperty.PropMath, DerivedProperty.Mod_ID_Continue_NO_Cf);
|
|
mask = Utility.setBits(mask, DerivedProperty.DefaultIgnorable, DerivedProperty.FC_NFC_Closure-1);
|
|
generateDerived(mask, HEADER_DERIVED, "DerivedCoreProperties-" + version );
|
|
|
|
} else if (arg.equalsIgnoreCase("caseignorable")) {
|
|
mask = Utility.setBits(0, DerivedProperty.Other_Case_Ignorable, DerivedProperty.Type_i);
|
|
generateDerived(mask, HEADER_DERIVED, "CaseIgnorable-" + version );
|
|
|
|
} else if (arg.equalsIgnoreCase("nfcprops")) {
|
|
mask = Utility.setBits(0, NFC_Leading, NFC_Resulting);
|
|
generateDerived(mask, HEADER_DERIVED, "NFKC_SafeStart-" + version);
|
|
|
|
} else if (arg.equalsIgnoreCase("nfunsafestart")) {
|
|
mask = Utility.setBits(0, NFD_UnsafeStart, NFKC_UnsafeStart);
|
|
generateDerived(mask, HEADER_DERIVED, "NFUnsafeStart-" + version);
|
|
|
|
} else if (arg.equalsIgnoreCase("DerivedAge")) {
|
|
generateAge("DerivedAge-" + version );
|
|
|
|
} else if (arg.equalsIgnoreCase("DerivedLineBreak")) {
|
|
generateVerticalSlice(LINE_BREAK, LINE_BREAK+NEXT_ENUM, KEEP_SPECIAL, HEADER_DERIVED,
|
|
"DerivedLineBreak-" + version );
|
|
} else if (arg.equalsIgnoreCase("Scripts")) {
|
|
generateVerticalSlice(SCRIPT+1, SCRIPT + NEXT_ENUM, KEEP_SPECIAL, HEADER_SCRIPTS, "Scripts-");
|
|
} else if (arg.equalsIgnoreCase("PropList")) {
|
|
generateVerticalSlice(BINARY_PROPERTIES + White_space, BINARY_PROPERTIES + NEXT_ENUM,
|
|
KEEP_SPECIAL, HEADER_EXTEND, "PropList-" + version);
|
|
} else if (arg.equalsIgnoreCase("AllBinary")) {
|
|
generateVerticalSlice(BINARY_PROPERTIES, BINARY_PROPERTIES + NEXT_ENUM,
|
|
KEEP_SPECIAL, HEADER_EXTEND, "AllBinary-" + version);
|
|
} else if (arg.equalsIgnoreCase("NormalizationTest")) {
|
|
writeNormalizerTestSuite("NormalizationTest-" + version + ".txt" );
|
|
} else if (arg.equalsIgnoreCase("generateCompExclusions")) {
|
|
generateCompExclusions();
|
|
}else {
|
|
System.out.println(" ! Unknown option -- must be one of the following (case-insensitive)");
|
|
System.out.println(" ! generateCompExclusions,...");
|
|
}
|
|
|
|
|
|
//checkHoffman("\u05B8\u05B9\u05B1\u0591\u05C3\u05B0\u05AC\u059F");
|
|
//checkHoffman("\u0592\u05B7\u05BC\u05A5\u05B0\u05C0\u05C4\u05AD");
|
|
|
|
|
|
//generateDerived(Utility.setBits(0, DerivedProperty.PropMath, DerivedProperty.Mod_ID_Continue_NO_Cf),
|
|
// HEADER_DERIVED, "DerivedPropData2-" + version );
|
|
//generateVerticalSlice(SCRIPT, SCRIPT+1, KEEP_SPECIAL, "ScriptCommon-" + version );
|
|
//listStrings("LowerCase-" + version , 0,0);
|
|
//generateVerticalSlice(0, LIMIT_ENUM, SKIP_SPECIAL, PROPLIST1, "DerivedPropData1-" + version );
|
|
|
|
// AGE stuff
|
|
//UCD ucd = UCD.make();
|
|
//System.out.println(ucd.getAgeID(0x61));
|
|
//System.out.println(ucd.getAgeID(0x2FA1D));
|
|
|
|
//
|
|
}
|
|
System.out.println("END");
|
|
}
|
|
|
|
static Normalizer nfkc = new Normalizer(Normalizer.NFKC);
|
|
|
|
public static void checkHoffman(String test) {
|
|
String result = nfkc.normalize(test);
|
|
System.out.println(Utility.hex(test) + " => " + Utility.hex(result));
|
|
System.out.println();
|
|
show(test, 0);
|
|
System.out.println();
|
|
show(result, 0);
|
|
}
|
|
|
|
public static void show(String s, int indent) {
|
|
int cp;
|
|
for (int i = 0; i < s.length(); i += UTF32.count16(cp)) {
|
|
cp = UTF32.char32At(s, i);
|
|
String cc = " " + ucd.getCombiningClass(cp);
|
|
cc = Utility.repeat(" ", 4 - cc.length()) + cc;
|
|
System.out.println(Utility.repeat(" ", indent) + ucd.getCode(cp) + cc + " " + ucd.getName(cp));
|
|
String decomp = nfkc.normalize(cp);
|
|
if (!decomp.equals(UTF32.valueOf32(cp))) {
|
|
show(decomp, indent + 4);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
static DateFormat myDateFormat = new SimpleDateFormat("yyyy-MM-dd' 'HH:mm:ss.S' GMT'");
|
|
|
|
static {
|
|
myDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
|
|
}
|
|
|
|
//Remove "d1" from DerivedJoiningGroup-3.1.0d1.txt type names
|
|
|
|
public static String fixFile(String s) {
|
|
int len = s.length();
|
|
if (!s.endsWith(".txt")) return s;
|
|
if (s.charAt(len-6) != 'd') return s;
|
|
char c = s.charAt(len-5);
|
|
if (c < '0' || '9' < c) return s;
|
|
System.out.println("Fixing File Name");
|
|
return s.substring(0,len-6) + s.substring(len-4);
|
|
}
|
|
|
|
static final int HEADER_EXTEND = 0, HEADER_DERIVED = 1, HEADER_SCRIPTS = 2;
|
|
|
|
public static void doHeader(String fileName, PrintWriter output, int headerChoice) {
|
|
output.println("# " + fileName + ".txt");
|
|
output.println("#");
|
|
if (headerChoice == HEADER_SCRIPTS) {
|
|
output.println("# For documentation, see UTR #24: Script Names");
|
|
output.println("# http://www.unicode.org/unicode/reports/tr24/");
|
|
} else if (headerChoice == HEADER_EXTEND) {
|
|
output.println("# Unicode Character Database: Extended Properties");
|
|
output.println("# For documentation, see PropList.html");
|
|
} else {
|
|
output.println("# Unicode Character Database: Derived Property Data");
|
|
output.println("# Generated algorithmically from the Unicode Character Database");
|
|
output.println("# For documentation, see DerivedProperties.html");
|
|
}
|
|
output.println("# Date: " + myDateFormat.format(new Date()) + " [MD]");
|
|
output.println("# Note: Unassigned and Noncharacter codepoints are omitted,");
|
|
output.println("# except when listing Noncharacter or Cn.");
|
|
output.println("# ================================================");
|
|
output.println();
|
|
}
|
|
|
|
public static void generateDerived (long bitMask, int headerChoice, String fileName) throws IOException {
|
|
PrintWriter output = Utility.openPrintWriter(fileName + "dX.txt");
|
|
doHeader(fileName, output, headerChoice);
|
|
for (int i = 0; i < DerivedProperty.LIMIT; ++i) {
|
|
if ((bitMask & (1L<<i)) == 0) continue;
|
|
System.out.print('.');
|
|
output.println("# ================================================");
|
|
output.println();
|
|
new DerivedPropertyLister(ucd, i, output).print();
|
|
output.flush();
|
|
}
|
|
output.close();
|
|
}
|
|
|
|
/*
|
|
public static void listStrings(String file, int type, int subtype) throws IOException {
|
|
ucd = UCD.make("3.1.0");
|
|
UCD ucd30 = UCD.make("3.0.0");
|
|
PrintStream output = new PrintStream(new FileOutputStream(GEN_DIR + file));
|
|
|
|
for (int i = 0; i < 0x10FFFF; ++i) {
|
|
if ((i & 0xFFF) == 0) System.out.println("# " + i);
|
|
if (!ucd.isRepresented(i)) continue;
|
|
if (ucd30.isRepresented(i)) continue;
|
|
String string = "";
|
|
switch(type) {
|
|
case 0: string = ucd.getSimpleLowercase(i);
|
|
}
|
|
if (UTF32.length32(string) == 1 && UTF32.char32At(string,0) == i) continue;
|
|
output.println(Utility.hex(i) + "; C; " + Utility.hex(string) + "; # " + ucd.getName(i));
|
|
}
|
|
output.close();
|
|
}
|
|
*/
|
|
|
|
public static void generateCompExclusions() throws IOException {
|
|
PrintWriter output = Utility.openPrintWriter("CompositionExclusionsDelta.txt");
|
|
new CompLister(output).print();
|
|
output.close();
|
|
}
|
|
|
|
static class CompLister extends PropertyLister {
|
|
UCD oldUCD;
|
|
int oldLength = 0;
|
|
|
|
public CompLister(PrintWriter output) {
|
|
this.output = output;
|
|
ucdData = UCD.make("3.1.0");
|
|
oldUCD = UCD.make("3.0.0");
|
|
showOnConsole = true;
|
|
}
|
|
public String propertyName(int cp) {
|
|
return UTF32.length32(ucdData.getDecompositionMapping(cp)) + "";
|
|
}
|
|
public byte status(int cp) {
|
|
if (ucdData.getDecompositionType(cp) == CANONICAL
|
|
&& oldUCD.getDecompositionType(cp) != CANONICAL) {
|
|
int temp = oldLength;
|
|
oldLength = UTF32.length32(ucdData.getDecompositionMapping(cp));
|
|
if (temp != oldLength) return BREAK;
|
|
return INCLUDE;
|
|
}
|
|
return EXCLUDE;
|
|
}
|
|
}
|
|
|
|
public static void partitionProperties() throws IOException {
|
|
|
|
// find properties
|
|
|
|
int count = 0;
|
|
int[] props = new int[500];
|
|
for (int i = 1; i < LIMIT_ENUM; ++i) { // || iType == SCRIPT
|
|
int iType = i & 0xFF00;
|
|
if (iType == JOINING_GROUP || iType == AGE || iType == COMBINING_CLASS) continue;
|
|
if (!ubp.isDefined(i)) continue;
|
|
props[count++] = i;
|
|
}
|
|
System.out.println("props: " + count);
|
|
|
|
BitSet probe = new BitSet();
|
|
Map map = new HashMap();
|
|
int total = 0;
|
|
for (int cp = 0; cp <= 0x10FFFF; ++cp) {
|
|
Utility.dot(cp);
|
|
int cat = ucd.getCategory(cp);
|
|
if (cat == UNASSIGNED || cat == PRIVATE_USE || cat == SURROGATE) continue;
|
|
if (!ucd.isAllocated(cp)) continue;
|
|
|
|
for (int i = 0; i < count; ++i) {
|
|
boolean iProp = ubp.get(cp, props[i]);
|
|
if (iProp) probe.set(i); else probe.clear(i);
|
|
}
|
|
|
|
++total;
|
|
if (!map.containsKey(probe)) {
|
|
map.put(probe.clone(), UTF32.valueOf32(cp));
|
|
Utility.fixDot();
|
|
System.out.println("Set Size: " + map.size() + ", total: " + total + ", " + ucd.getCodeAndName(cp));
|
|
}
|
|
}
|
|
|
|
Utility.fixDot();
|
|
System.out.println("Set Size: " + map.size());
|
|
}
|
|
|
|
public static void listDifferences() throws IOException {
|
|
|
|
PrintWriter output = Utility.openPrintWriter("PropertyDifferences.txt");
|
|
|
|
for (int i = 1; i < LIMIT_ENUM; ++i) {
|
|
int iType = i & 0xFF00;
|
|
if (iType == JOINING_GROUP || iType == AGE || iType == COMBINING_CLASS || iType == SCRIPT) continue;
|
|
if (!ubp.isDefined(i)) continue;
|
|
String iNameShort = ubp.getFullID(i, SHORT);
|
|
String iNameLong = ubp.getFullID(i, LONG);
|
|
|
|
System.out.println();
|
|
System.out.println();
|
|
System.out.println(iNameLong);
|
|
output.println("#" + iNameLong);
|
|
|
|
int last = -1;
|
|
for (int j = i+1; j < LIMIT_ENUM; ++j) {
|
|
int jType = j & 0xFF00;
|
|
if (jType == JOINING_GROUP || jType == AGE || jType == COMBINING_CLASS || jType == SCRIPT
|
|
|| (jType == iType && jType != BINARY_PROPERTIES)) continue;
|
|
if (!ubp.isDefined(j)) continue;
|
|
|
|
if ((j >> 8) != last) {
|
|
last = j >> 8;
|
|
System.out.println();
|
|
System.out.print("\t" + UCD_Names.SHORT_UNIFIED_PROPERTIES[last]);
|
|
output.flush();
|
|
output.println("#\t" + UCD_Names.SHORT_UNIFIED_PROPERTIES[last]);
|
|
} else {
|
|
System.out.print('.');
|
|
}
|
|
System.out.flush();
|
|
|
|
int bothCount = 0, i_jPropCount = 0, j_iPropCount = 0, iCount = 0, jCount = 0;
|
|
|
|
for (int cp = 0; cp <= 0x10FFFF; ++cp) {
|
|
int cat = ucd.getCategory(cp);
|
|
if (cat == UNASSIGNED || cat == PRIVATE_USE || cat == SURROGATE) continue;
|
|
if (!ucd.isAllocated(cp)) continue;
|
|
|
|
boolean iProp = ubp.get(cp, i);
|
|
boolean jProp = ubp.get(cp, j);
|
|
|
|
if (jProp) ++jCount;
|
|
if (iProp) {
|
|
++iCount;
|
|
if (jProp) ++bothCount;
|
|
else ++i_jPropCount;
|
|
} else if (jProp) ++j_iPropCount;
|
|
}
|
|
if (iCount == 0 || jCount == 0) continue;
|
|
|
|
String jNameShort = ubp.getFullID(j, SHORT);
|
|
//String jNameLong = ubp.getFullID(j, LONG);
|
|
|
|
String rel = bothCount == 0 ? "DISJOINT"
|
|
: i_jPropCount == 0 && j_iPropCount == 0 ? "EQUALS"
|
|
: i_jPropCount == 0 ? "CONTAINS" // depends on reverse output
|
|
: j_iPropCount == 0 ? "CONTAINS"
|
|
: "OVERLAPS";
|
|
|
|
if (j_iPropCount > i_jPropCount) {
|
|
// reverse output
|
|
output.println(jNameShort + "\t" + iNameShort + "\t" + rel
|
|
+ "\t" + bothCount + "\t" + j_iPropCount + "\t" + i_jPropCount);
|
|
} else {
|
|
output.println(iNameShort + "\t" + jNameShort + "\t" + rel
|
|
+ "\t" + bothCount + "\t" + i_jPropCount + "\t" + j_iPropCount);
|
|
}
|
|
}
|
|
}
|
|
output.close();
|
|
}
|
|
|
|
|
|
public static void listProperties() throws IOException {
|
|
String propAbb = "";
|
|
String prop = "";
|
|
|
|
Map duplicates = new TreeMap();
|
|
Set sorted = new TreeSet(java.text.Collator.getInstance());
|
|
String spacing;
|
|
|
|
for(int k = 0; k < UCD_Names.NON_ENUMERATED.length; ++k) {
|
|
propAbb = UCD_Names.NON_ENUMERATED[k][0];
|
|
prop = UCD_Names.NON_ENUMERATED[k][1];
|
|
spacing = Utility.repeat(" ", 10-propAbb.length());
|
|
sorted.add("AA; " + propAbb + spacing + "; " + prop);
|
|
checkDuplicate(duplicates, propAbb, prop);
|
|
if (!prop.equals(propAbb)) checkDuplicate(duplicates, prop, prop);
|
|
}
|
|
|
|
sorted.add("xx; T ; True");
|
|
checkDuplicate(duplicates, "T", "xx");
|
|
sorted.add("xx; F ; False");
|
|
checkDuplicate(duplicates, "F", "xx");
|
|
sorted.add("qc; Y ; Yes");
|
|
checkDuplicate(duplicates, "Y", "qc");
|
|
sorted.add("qc; N ; No");
|
|
checkDuplicate(duplicates, "Y", "qc");
|
|
sorted.add("qc; M ; Maybe");
|
|
checkDuplicate(duplicates, "Y", "qc");
|
|
|
|
|
|
for (int i = 0; i < LIMIT_ENUM; ++i) {
|
|
int type = i & 0xFF00;
|
|
if (type == AGE) continue;
|
|
if (i == (BINARY_PROPERTIES | CaseFoldTurkishI)) continue;
|
|
|
|
if (type == i && type != BINARY_PROPERTIES && type != DERIVED) {
|
|
propAbb = ubp.getPropertyName(i, SHORT);
|
|
prop = ubp.getPropertyName(i, LONG);
|
|
spacing = Utility.repeat(" ", 10-propAbb.length());
|
|
sorted.add("BB; " + propAbb + spacing + "; " + prop);
|
|
checkDuplicate(duplicates, propAbb, prop);
|
|
if (!prop.equals(propAbb)) checkDuplicate(duplicates, prop, prop);
|
|
}
|
|
|
|
if (!ubp.isDefined(i)) continue;
|
|
if (ubp.isTest(i)) continue;
|
|
|
|
String value = ubp.getID(i, LONG);
|
|
if (value.length() == 0) value = "none";
|
|
else if (value.equals("<unused>")) continue;
|
|
value = fixGaps(value);
|
|
|
|
if (type == SCRIPT) {
|
|
value = ucd.getCase(value, FULL, TITLE);
|
|
}
|
|
|
|
String abbvalue = ubp.getID(i, SHORT);
|
|
if (abbvalue.length() == 0) abbvalue = "no";
|
|
|
|
if (type == COMBINING_CLASS) {
|
|
if (value.startsWith("Fixed_")) { continue; }
|
|
}
|
|
|
|
/*
|
|
String elide = "";
|
|
if (type == CATEGORY || type == SCRIPT || type == BINARY_PROPERTIES) elide = "\\p{"
|
|
+ abbvalue
|
|
+ "}";
|
|
String abb = "";
|
|
if (type != BINARY_PROPERTIES) abb = "\\p{"
|
|
+ UCD_Names.ABB_UNIFIED_PROPERTIES[i>>8]
|
|
+ "="
|
|
+ abbvalue
|
|
+ "}";
|
|
String norm = "";
|
|
if (type != BINARY_PROPERTIES) norm = "\\p{"
|
|
+ UCD_Names.SHORT_UNIFIED_PROPERTIES[i>>8]
|
|
+ "="
|
|
+ value
|
|
+ "}";
|
|
System.out.println("<tr><td>" + elide + "</td><td>" + abb + "</td><td>" + norm + "</td></tr>");
|
|
*/
|
|
|
|
spacing = Utility.repeat(" ", 10-abbvalue.length());
|
|
|
|
if (type == BINARY_PROPERTIES || type == DERIVED) {
|
|
sorted.add("ZZ; " + abbvalue + spacing + "; " + value);
|
|
checkDuplicate(duplicates, value, value);
|
|
if (!value.equals(abbvalue)) checkDuplicate(duplicates, abbvalue, value);
|
|
continue;
|
|
}
|
|
|
|
sorted.add(propAbb + "; " + abbvalue + spacing + "; " + value);
|
|
checkDuplicate(duplicates, value, prop + "=" + value);
|
|
if (!value.equals(abbvalue)) checkDuplicate(duplicates, abbvalue, prop + "=" + value);
|
|
}
|
|
|
|
PrintWriter log = Utility.openPrintWriter("PropertyAliases.txt");
|
|
Utility.appendFile("PropertyAliasHeader.txt", log);
|
|
Utility.print(log, sorted, "\r\n", new MyBreaker());
|
|
log.close();
|
|
}
|
|
|
|
static class MyBreaker implements Utility.Breaker {
|
|
public String get(Object current, Object old) {
|
|
if (old == null) return "";
|
|
String c = current.toString();
|
|
String o = old.toString();
|
|
if (c.length() >= 2 && o.length() >= 0 && !c.substring(0,2).equals(o.substring(0,2))) {
|
|
return "\r\n";
|
|
}
|
|
return "";
|
|
}
|
|
}
|
|
|
|
static void checkDuplicate(Map m, String toCheck, String comment) {
|
|
String result = (String) m.get(toCheck);
|
|
if (result != null) {
|
|
System.out.println("Collision with " + toCheck);
|
|
System.out.println(" Between " + comment);
|
|
System.out.println(" And " + result);
|
|
} else {
|
|
m.put(skeleton(toCheck), comment);
|
|
}
|
|
}
|
|
|
|
static String fixGaps(String source) {
|
|
StringBuffer result = new StringBuffer();
|
|
byte lastCat = -1;
|
|
for (int i = 0; i < source.length(); ++i) {
|
|
char c = source.charAt(i);
|
|
if (c == ' ' || c == '-') c = '_';
|
|
byte cat = ucd.getCategory(c);
|
|
if (lastCat == Ll && cat == Lu) {
|
|
result.append('_');
|
|
}
|
|
result.append(c);
|
|
lastCat = cat;
|
|
}
|
|
return result.toString();
|
|
}
|
|
|
|
static String skeleton(String source) {
|
|
StringBuffer result = new StringBuffer();
|
|
source = source.toLowerCase();
|
|
for (int i = 0; i < source.length(); ++i) {
|
|
char c = source.charAt(i);
|
|
if (c < 'a' || c > 'z') continue;
|
|
result.append(c);
|
|
}
|
|
return result.toString();
|
|
}
|
|
|
|
static final byte KEEP_SPECIAL = 0, SKIP_SPECIAL = 1;
|
|
|
|
public static void generateVerticalSlice(int startEnum, int endEnum, byte skipSpecial,
|
|
int headerChoice, String file) throws IOException {
|
|
|
|
//System.out.println(ucd.toString(0x1E0A));
|
|
/*
|
|
System.out.println(ucd.getData(0xFFFF));
|
|
System.out.println(ucd.getData(0x100000));
|
|
System.out.println(ucd.getData(0x100000-1));
|
|
System.out.println(ucd.getData(0x100000-2));
|
|
System.out.println(ucd.getData(0x100000-3));
|
|
if (true) return;
|
|
String test2 = ucd.getName(0x2A6D6);
|
|
//*/
|
|
|
|
|
|
PrintWriter output = Utility.openPrintWriter(file + "dX.txt");
|
|
doHeader(file, output, headerChoice);
|
|
int last = -1;
|
|
for (int i = startEnum; i < endEnum; ++i) {
|
|
if (!ubp.isDefined(i)) continue;
|
|
if (i == DECOMPOSITION_TYPE || i == NUMERIC_TYPE
|
|
|| i == (BINARY_PROPERTIES | Non_break)
|
|
|| i == (BINARY_PROPERTIES | CaseFoldTurkishI)
|
|
|| i == (JOINING_TYPE | JT_U)
|
|
|| i == (JOINING_GROUP | NO_SHAPING)
|
|
) continue; // skip zero case
|
|
if (skipSpecial == SKIP_SPECIAL
|
|
&& i >= (BINARY_PROPERTIES | CompositionExclusion)
|
|
&& i < (AGE + NEXT_ENUM)) continue;
|
|
if ((last & 0xFF00) != (i & 0xFF00) && (i <= BINARY_PROPERTIES || i >= SCRIPT)) {
|
|
output.println();
|
|
output.println("# ================================================");
|
|
output.println("# " + UCD_Names.UNIFIED_PROPERTIES[i>>8]);
|
|
output.println("# ================================================");
|
|
output.println();
|
|
System.out.println();
|
|
System.out.println(UCD_Names.UNIFIED_PROPERTIES[i>>8]);
|
|
last = i;
|
|
} else {
|
|
output.println("# ================================================");
|
|
output.println();
|
|
}
|
|
System.out.print(".");
|
|
new MyPropertyLister(ucd, i, output).print();
|
|
}
|
|
if (endEnum == LIMIT_ENUM) {
|
|
output.println();
|
|
output.println("# ================================================");
|
|
output.println("# Numeric Values (from UnicodeData.txt, field 6/7/8)");
|
|
output.println("# ================================================");
|
|
output.println();
|
|
System.out.println();
|
|
System.out.println("@NUMERIC VALUES");
|
|
|
|
Set floatSet = new TreeSet();
|
|
for (int i = 0; i < 0x10FFFF; ++i) {
|
|
float nv = ucd.getNumericValue(i);
|
|
if (Float.isNaN(nv)) continue;
|
|
floatSet.add(new Float(nv));
|
|
}
|
|
Iterator it = floatSet.iterator();
|
|
while(it.hasNext()) {
|
|
new MyFloatLister(ucd, ((Float)it.next()).floatValue(), output).print();
|
|
output.println();
|
|
System.out.print(".");
|
|
}
|
|
output.flush();
|
|
}
|
|
output.close();
|
|
System.out.println();
|
|
}
|
|
|
|
static UCD ucd;
|
|
|
|
static public Normalizer formC, formD, formKC, formKD;
|
|
|
|
static public void writeNormalizerTestSuite(String fileName) throws IOException {
|
|
|
|
PrintWriter log = Utility.openPrintWriter(fileName);
|
|
|
|
formC = new Normalizer(Normalizer.NFC);
|
|
formD = new Normalizer(Normalizer.NFD);
|
|
formKC = new Normalizer(Normalizer.NFKC);
|
|
formKD = new Normalizer(Normalizer.NFKD);
|
|
|
|
String[] example = new String[256];
|
|
|
|
log.println("# " + fixFile(fileName));
|
|
log.println("#");
|
|
log.println("# Normalization Test Suite");
|
|
log.println("# Date: " + myDateFormat.format(new Date()) + " [MD]");
|
|
log.println("# Format:");
|
|
log.println("#");
|
|
log.println("# Columns (c1, c2,...) are separated by semicolons");
|
|
log.println("# Comments are indicated with hash marks");
|
|
log.println("#");
|
|
log.println("# CONFORMANCE:");
|
|
log.println("# 1. The following invariants must be true for all conformant implementations");
|
|
log.println("#");
|
|
log.println("# NFC");
|
|
log.println("# c2 == NFC(c1) == NFC(c2) == NFC(c3)");
|
|
log.println("# c4 == NFC(c4) == NFC(c5)");
|
|
log.println("#");
|
|
log.println("# NFD");
|
|
log.println("# c3 == NFD(c1) == NFD(c2) == NFD(c3)");
|
|
log.println("# c5 == NFD(c4) == NFD(c5");
|
|
log.println("#");
|
|
log.println("# NFKC");
|
|
log.println("# c4 == NFKC(c1) == NFKC(c2) == NFKC(c3) == NFKC(c4) == NFKC(c5)");
|
|
log.println("#");
|
|
log.println("# NFKD");
|
|
log.println("# c5 == NFKD(c1) == NFKD(c2) == NFKD(c3) == NFKD(c4) == NFKD(c5)");
|
|
log.println("#");
|
|
log.println("# 2. For every assigned Unicode 3.1.0 code point X that is not specifically");
|
|
log.println("# listed in Part 1, the following invariants must be true for all conformant");
|
|
log.println("# implementations:");
|
|
log.println("#");
|
|
log.println("# X == NFC(X) == NFD(X) == NFKC(X) == NFKD(X)");
|
|
|
|
System.out.println("Writing Part 1");
|
|
|
|
log.println("#");
|
|
log.println("@Part0 # Specific cases");
|
|
log.println("#");
|
|
|
|
for (int j = 0; j < testSuiteCases.length; ++j) {
|
|
writeLine(testSuiteCases[j], log, false);
|
|
}
|
|
|
|
System.out.println("Writing Part 2");
|
|
|
|
log.println("#");
|
|
log.println("@Part1 # Character by character test");
|
|
log.println("# All characters not explicitly occurring in c1 of Part 1 have identical NFC, D, KC, KD forms.");
|
|
log.println("#");
|
|
|
|
for (int ch = 0; ch < 0x10FFFF; ++ch) {
|
|
Utility.dot(ch);
|
|
if (!ucd.isAssigned(ch)) continue;
|
|
if (ucd.isPUA(ch)) continue;
|
|
String cc = UTF32.valueOf32(ch);
|
|
writeLine(cc,log, true);
|
|
}
|
|
Utility.fixDot();
|
|
|
|
System.out.println("Finding Examples");
|
|
|
|
for (int ch = 0; ch < 0x10FFFF; ++ch) {
|
|
Utility.dot(ch);
|
|
if (!ucd.isAssigned(ch)) continue;
|
|
if (ucd.isPUA(ch)) continue;
|
|
int cc = ucd.getCombiningClass(ch);
|
|
if (example[cc] == null) example[cc] = UTF32.valueOf32(ch);
|
|
}
|
|
|
|
Utility.fixDot();
|
|
System.out.println("Writing Part 2");
|
|
|
|
log.println("#");
|
|
log.println("@Part2 # Canonical Order Test");
|
|
log.println("#");
|
|
|
|
for (int ch = 0; ch < 0x10FFFF; ++ch) {
|
|
|
|
Utility.dot(ch);
|
|
if (!ucd.isAssigned(ch)) continue;
|
|
if (ucd.isPUA(ch)) continue;
|
|
short c = ucd.getCombiningClass(ch);
|
|
if (c == 0) continue;
|
|
|
|
// add character with higher class, same class, lower class
|
|
|
|
String sample = "";
|
|
for (int i = c+1; i < example.length; ++i) {
|
|
if (example[i] == null) continue;
|
|
sample += example[i];
|
|
break;
|
|
}
|
|
sample += example[c];
|
|
for (int i = c-1; i > 0; --i) {
|
|
if (example[i] == null) continue;
|
|
sample += example[i];
|
|
break;
|
|
}
|
|
|
|
writeLine("a" + sample + UTF32.valueOf32(ch) + "b", log, false);
|
|
writeLine("a" + UTF32.valueOf32(ch) + sample + "b", log, false);
|
|
}
|
|
Utility.fixDot();
|
|
log.println("#");
|
|
log.println("# END OF FILE");
|
|
log.close();
|
|
}
|
|
|
|
static void writeLine(String cc, PrintWriter log, boolean check) {
|
|
String c = formC.normalize(cc);
|
|
String d = formD.normalize(cc);
|
|
String kc = formKC.normalize(cc);
|
|
String kd = formKD.normalize(cc);
|
|
if (check & cc.equals(c) && cc.equals(d) && cc.equals(kc) && cc.equals(kd)) return;
|
|
|
|
// consistency check
|
|
String dc = formD.normalize(c);
|
|
String dkc = formD.normalize(kc);
|
|
if (!dc.equals(d) || !dkc.equals(kd)) {
|
|
System.out.println("Danger Will Robinson!");
|
|
Normalizer.SHOW_PROGRESS = true;
|
|
d = formD.normalize(cc);
|
|
}
|
|
|
|
// printout
|
|
log.println(
|
|
Utility.hex(cc," ") + ";" + Utility.hex(c," ") + ";" + Utility.hex(d," ") + ";"
|
|
+ Utility.hex(kc," ") + ";" + Utility.hex(kd," ")
|
|
+ "; # ("
|
|
+ comma(cc) + "; " + comma(c) + "; " + comma(d) + "; " + comma(kc) + "; " + comma(kd) + "; "
|
|
+ ") " + ucd.getName(cc));
|
|
}
|
|
|
|
static StringBuffer commaResult = new StringBuffer();
|
|
|
|
// not recursive!!!
|
|
static final String comma(String s) {
|
|
commaResult.setLength(0);
|
|
int cp;
|
|
for (int i = 0; i < s.length(); i += UTF32.count16(i)) {
|
|
cp = UTF32.char32At(s, i);
|
|
if (ucd.getCategory(cp) == Mn) commaResult.append('\u25CC');
|
|
UTF32.append32(commaResult, cp);
|
|
}
|
|
return commaResult.toString();
|
|
}
|
|
|
|
static final String[] testSuiteCases = {
|
|
"\u1E0A",
|
|
"\u1E0C",
|
|
"\u1E0A\u0323",
|
|
"\u1E0C\u0307",
|
|
"D\u0307\u0323",
|
|
"D\u0323\u0307",
|
|
"\u1E0A\u031B",
|
|
"\u1E0C\u031B",
|
|
"\u1E0A\u031B\u0323",
|
|
"\u1E0C\u031B\u0307",
|
|
"D\u031B\u0307\u0323",
|
|
"D\u031B\u0323\u0307",
|
|
"\u00C8",
|
|
"\u0112",
|
|
"E\u0300",
|
|
"E\u0304",
|
|
"\u1E14",
|
|
"\u0112\u0300",
|
|
"\u1E14\u0304",
|
|
"E\u0304\u0300",
|
|
"E\u0300\u0304",
|
|
"\u05B8\u05B9\u05B1\u0591\u05C3\u05B0\u05AC\u059F",
|
|
"\u0592\u05B7\u05BC\u05A5\u05B0\u05C0\u05C4\u05AD"
|
|
|
|
};
|
|
|
|
static final void generateAge(String filename) throws IOException {
|
|
PrintWriter log = Utility.openPrintWriter(filename + "dX.txt");
|
|
try {
|
|
log.println("# Derived file showing when various code points were designated in Unicode");
|
|
log.println("# author: M. Davis");
|
|
log.println("# generated: " + new Date());
|
|
log.println("# Notes:");
|
|
log.println("# - The term 'designated' means that a previously reserved code point was specified");
|
|
log.println("# to be a noncharacter or surrogate, or assigned as a character,");
|
|
log.println("# control or format code.");
|
|
log.println("# - Versions are only tracked from 1.1 onwards, since version 1.0");
|
|
log.println("# predated changes required by the ISO 10646 merger.");
|
|
log.println("# - The Hangul Syllables that were removed from 2.0 are not included in the 1.1 listing.");
|
|
log.println("# - The supplementary private use code points and the non-character code points");
|
|
log.println("# were designated in version 2.0, but not specifically listed in the UCD");
|
|
log.println("# until versions 3.0 and 3.1 respectively.");
|
|
|
|
log.println("# ================================================");
|
|
log.println();
|
|
new DiffPropertyLister(null, "1.1.0", log).print();
|
|
log.println("# ================================================");
|
|
log.println();
|
|
new DiffPropertyLister("1.1.0", "2.0.0", log).print();
|
|
log.println("# ================================================");
|
|
log.println();
|
|
new DiffPropertyLister("2.0.0", "2.1.2", log).print();
|
|
log.println("# ================================================");
|
|
log.println();
|
|
new DiffPropertyLister("2.1.2", "3.0.0", log).print();
|
|
log.println("# ================================================");
|
|
log.println();
|
|
new DiffPropertyLister("3.0.0", "3.1.0", log).print();
|
|
log.println("# ================================================");
|
|
log.println();
|
|
new DiffPropertyLister("3.1.0", "3.2.0", log).print();
|
|
/*
|
|
printDiff("110", "200");
|
|
UnicodeSet u11 = fromFile(BASE_DIR + "UnicodeData\\Versions\\UnicodeData-1.1.txt", false);
|
|
UnicodeSet u20 = fromFile(BASE_DIR + "UnicodeData\\Versions\\UnicodeData-2.0.txt", false);
|
|
UnicodeSet u21 = fromFile(BASE_DIR + "UnicodeData\\Versions\\UnicodeData-2.1.txt", false);
|
|
UnicodeSet u30 = fromFile(BASE_DIR + "UnicodeData\\Versions\\UnicodeData-3.0.txt", false);
|
|
UnicodeSet u31 = fromFile(BASE_DIR + "UnicodeData\\Versions\\UnicodeData-3.1.txt", false);
|
|
|
|
log.println();
|
|
log.println("# Code points assigned in Unicode 1.1 (minus Hangul Syllables): "
|
|
+ n.format(u11.count()));
|
|
log.println();
|
|
u11.print(log, false, false, "1.1");
|
|
|
|
UnicodeSet u20m = new UnicodeSet(u20).remove(u11);
|
|
log.println();
|
|
log.println("# Code points assigned in Unicode 2.0 (minus Unicode 1.1): "
|
|
+ n.format(u20m.count()));
|
|
log.println();
|
|
u20m.print(log, false, false, "2.0");
|
|
|
|
UnicodeSet u21m = new UnicodeSet(u21).remove(u20);
|
|
log.println();
|
|
log.println("# Code points assigned in Unicode 2.1 (minus Unicode 2.0): "
|
|
+ n.format(u21m.count()));
|
|
log.println();
|
|
u21m.print(log, false, false, "2.1");
|
|
|
|
UnicodeSet u30m = new UnicodeSet(u30).remove(u21);
|
|
log.println();
|
|
log.println("# Code points assigned in Unicode 3.0 (minus Unicode 2.1): "
|
|
+ n.format(u30m.count()));
|
|
log.println();
|
|
u30m.print(log, false, false, "3.0");
|
|
|
|
UnicodeSet u31m = new UnicodeSet(u31).remove(u30);
|
|
log.println();
|
|
log.println("# Code points assigned in Unicode 3.1 (minus Unicode 3.0): "
|
|
+ n.format(u31m.count()));
|
|
log.println();
|
|
u31m.print(log, false, false, "3.1");
|
|
*/
|
|
} finally {
|
|
if (log != null) log.close();
|
|
}
|
|
|
|
}
|
|
|
|
public static void listCombiningAccents() throws IOException {
|
|
PrintWriter log = Utility.openPrintWriter("ListAccents.txt");
|
|
Normalizer nfd = new Normalizer(Normalizer.NFD);
|
|
Set set = new TreeSet();
|
|
Set set2 = new TreeSet();
|
|
|
|
for (int i = 0; i < 0x10FFFF; ++i) {
|
|
Utility.dot(i);
|
|
if (!ucd.isRepresented(i)) continue;
|
|
|
|
if (!nfd.hasDecomposition(i)) {
|
|
if (ucd.getScript(i) == LATIN_SCRIPT) {
|
|
int cp = i;
|
|
String hex = "u" + Utility.hex(cp, 4);
|
|
set.add("# yyy $x <> \\" + hex + " ; # " + ucd.getName(cp));
|
|
}
|
|
continue;
|
|
}
|
|
|
|
String decomp = nfd.normalize(i);
|
|
int j;
|
|
for (j = 0; j < decomp.length(); j += UTF16.getCharCount(i)) {
|
|
int cp = UTF16.charAt(decomp, j);
|
|
byte cat = ucd.getCategory(cp);
|
|
if (cat != Mn) continue;
|
|
String hex = "u" + Utility.hex(cp, 4);
|
|
set.add("# xxx $x <> \\" + hex + " ; # " + ucd.getName(cp));
|
|
}
|
|
}
|
|
|
|
Iterator it = set.iterator();
|
|
while (it.hasNext()) {
|
|
log.println(it.next());
|
|
}
|
|
log.close();
|
|
}
|
|
|
|
public static void listGreekVowels() throws IOException {
|
|
PrintWriter log = Utility.openPrintWriter("ListGreekVowels.txt");
|
|
Normalizer nfd = new Normalizer(Normalizer.NFD);
|
|
Normalizer nfc = new Normalizer(Normalizer.NFC);
|
|
Set set = new TreeSet();
|
|
Set set2 = new TreeSet();
|
|
|
|
String vowels = "\u03B1\u03B5\u03B7\u03B9\u03BF\u03C5\u03C9\u0391\u0395\u0397\u0399\u039F\u03A5\u03A9";
|
|
String diphthongEnd = "\u03B9\u03C5\u0399\u03A5";
|
|
String diphthongStart = "\u03B1\u03B5\u03B7\u03BF\u03C5\u0391\u0395\u0397\u039F\u03A5";
|
|
String etas = "\u03B7\u0397";
|
|
String iotas = "\u03B9\u0399";
|
|
|
|
for (char i = 0; i < 0xFFFF; ++i) {
|
|
Utility.dot(i);
|
|
if (!ucd.isRepresented(i)) continue;
|
|
if (ucd.getScript(i) != GREEK_SCRIPT) continue;
|
|
String decomp = nfd.normalize(i);
|
|
|
|
if (decomp.indexOf('\u0306') >= 0) continue; // skip breve
|
|
if (decomp.indexOf('\u0304') >= 0) continue; // skip macron
|
|
|
|
String comp = nfc.normalize(decomp);
|
|
if (!comp.equals(String.valueOf(i))) continue; // skip compats
|
|
|
|
char first = decomp.charAt(0);
|
|
|
|
if (vowels.indexOf(first) < 0) continue;
|
|
|
|
String h = "";
|
|
if (decomp.indexOf('\u0314') >= 0) h = "\uFFFF";
|
|
|
|
if (diphthongEnd.indexOf(first) >= 0) {
|
|
for (int j = 0; j < diphthongStart.length(); ++j) {
|
|
String v = diphthongStart.substring(j, j+1);
|
|
char vc = v.charAt(0);
|
|
if (ucd.getCategory(vc) == Ll && ucd.getCategory(first) == Lu) continue;
|
|
if (etas.indexOf(vc) >= 0 && iotas.indexOf(first) >= 0) continue;
|
|
set.add(new Pair(h + v + first, new Pair(v + decomp, v + i)));
|
|
}
|
|
}
|
|
set.add(new Pair(h+first, new Pair(decomp, String.valueOf(i))));
|
|
}
|
|
|
|
Iterator it = set.iterator();
|
|
Object last = "";
|
|
while (it.hasNext()) {
|
|
Pair p = (Pair) it.next();
|
|
if (!last.equals(p.first)) {
|
|
log.println();
|
|
last = p.first;
|
|
} else {
|
|
log.print(", ");
|
|
}
|
|
p = (Pair) p.second;
|
|
log.print(p.second);
|
|
}
|
|
log.close();
|
|
}
|
|
|
|
public static void listKatakana() throws IOException {
|
|
|
|
for (char i = 'a'; i <= 'z'; ++i) {
|
|
doKana(String.valueOf(i));
|
|
if (i == 'c') doKana("ch");
|
|
if (i == 's') doKana("sh");
|
|
if (i == 'd') {
|
|
doKana("dz");
|
|
doKana("dj");
|
|
}
|
|
}
|
|
|
|
System.out.println();
|
|
}
|
|
|
|
public static void doKana(String i) {
|
|
|
|
String vowels = "aeiou";
|
|
System.out.println();
|
|
System.out.print(i + " " + i + i);
|
|
System.out.println();
|
|
for (int j = 0; j < vowels.length(); ++j) {
|
|
char c = vowels.charAt(j);
|
|
System.out.print(" " + i + c);
|
|
}
|
|
|
|
System.out.println();
|
|
for (int j = 0; j < vowels.length(); ++j) {
|
|
char c = vowels.charAt(j);
|
|
System.out.print(" " + i + "y" + c);
|
|
}
|
|
}
|
|
} |