Synced to current nx01 snapshot and removed EL tomcat dep

This commit is contained in:
Willem Cazander 2026-04-20 17:26:34 +02:00
parent 3428ad1bf1
commit 57c087866c
23 changed files with 85 additions and 106 deletions

View file

@ -46,7 +46,7 @@ import love.distributedrebirth.unicode4d.atlas.FontAtlas;
import love.distributedrebirth.unicode4d.atlas.FontAtlasDriver;
import love.distributedrebirth.unicode4d.atlas.FontAtlasStore;
import love.distributedrebirth.unicode4d.atlas.FontAtlasStoreGlyph;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodePlane;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodeBlock;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᐪᓫᣗᔿᑊᣕᣔᐪᐤᣗ.T002ᖟ;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᒢᓫᑊᐣᑊ.ᔿᓫᒻᓫᓫ.V072Tong;
import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒃᣔᒃᓫᒻ.ᑊᐣᓑᖮᐪᔆ.DuytsDocAuthor注;
@ -173,7 +173,7 @@ public class TestConvFont {
private boolean startPoint = false;
private V072Tong point = null;
private int unicode = -1;
private UnicodePlane unicodePlane2;
private UnicodeBlock unicodePlane2;
public FontContentHandler(FontAtlasStore fontStore, String inputName) {
@ -251,7 +251,7 @@ public class TestConvFont {
unicodeStr = unicodeStr.substring(7);
}
unicode = Integer.parseInt(unicodeStr, 16);
unicodePlane2 = UnicodePlane.valueOfUnicode(unicode);
unicodePlane2 = UnicodeBlock.valueOfUnicode(unicode);
int xMax = Integer.parseInt(atts.getValue("xMax"));
int yMax = Integer.parseInt(atts.getValue("yMax"));
int xMin = Integer.parseInt(atts.getValue("xMin"));

View file

@ -36,7 +36,7 @@ import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.SwingUtilities;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodePlane;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodeBlock;
import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒃᣔᒃᓫᒻ.ᑊᐣᓑᖮᐪᔆ.DuytsDocAuthor注;
@DuytsDocAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
@ -49,10 +49,10 @@ public class TestSwingPlane extends JPanel {
String[] columnNames = { "Plane", "Example"};
Object[][] data = new Object[UnicodePlane.values().length][2];
Object[][] data = new Object[UnicodeBlock.values().length][2];
int x=0;
for (UnicodePlane plane:UnicodePlane.values()) {
for (UnicodeBlock plane:UnicodeBlock.values()) {
data[x][0] = plane.name();
StringBuilder buf = new StringBuilder();
int offset = 33;