Renamed terminators

This commit is contained in:
Willem Cazander 2022-11-07 20:50:55 +01:00
parent 0886d6eac9
commit 39b66404dd
88 changed files with 1014 additions and 1011 deletions

View file

@ -15,7 +15,7 @@ import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
import love.distributedrebirth.numberxd.base2t.part.T002PartBinary;
import love.distributedrebirth.numberxd.base2t.part.T002;
import love.distributedrebirth.numberxd.base2t.type.V072Tong;
import love.distributedrebirth.numberxd.unicode.UnicodePlane;
import love.distributedrebirth.unicode4d.atlas.FontAtlas;
@ -170,7 +170,7 @@ public class TestConvFont {
} else if ("glyph".equals(qName)) {
if (CodePointCommandᶻᴰ.NOP != CodePointᶻᴰ.INSTANCE.getCommand(point.getValue(T002PartBinary.PART_1))) {
if (CodePointCommandᶻᴰ.NOP != CodePointᶻᴰ.INSTANCE.getCommand(point.getValue(T002.PART_1))) {
tongs.add(point);
}
glyphCounter++;
@ -215,8 +215,8 @@ public class TestConvFont {
} else if ("glyph".equals(qName)) {
tongs = new ArrayList<>();
point = new V072Tong();
CodePointᶻᴰ.INSTANCE.setCommand(point.getValue(T002PartBinary.PART_1), CodePointCommandᶻᴰ.NOP);
CodePointᶻᴰ.INSTANCE.setCommand(point.getValue(T002PartBinary.PART_2), CodePointCommandᶻᴰ.NOP);
CodePointᶻᴰ.INSTANCE.setCommand(point.getValue(T002.PART_1), CodePointCommandᶻᴰ.NOP);
CodePointᶻᴰ.INSTANCE.setCommand(point.getValue(T002.PART_2), CodePointCommandᶻᴰ.NOP);
String unicodeStr = atts.getValue("unicode");
if (unicodeStr.startsWith("0000, ")) {
@ -236,27 +236,27 @@ public class TestConvFont {
V072Tong v2 = new V072Tong();
if (unicodePlane2.isLeftToRight()) {
CodePointᶻᴰ.INSTANCE.setCommand(v0.getValue(T002PartBinary.PART_1), CodePointCommandᶻᴰ.START_LR);
CodePointᶻᴰ.INSTANCE.setCommand(v0.getValue(T002.PART_1), CodePointCommandᶻᴰ.START_LR);
} else {
CodePointᶻᴰ.INSTANCE.setCommand(v0.getValue(T002PartBinary.PART_1), CodePointCommandᶻᴰ.START_RL);
CodePointᶻᴰ.INSTANCE.setCommand(v0.getValue(T002.PART_1), CodePointCommandᶻᴰ.START_RL);
}
CodePointᶻᴰ.INSTANCE.setCommand(v0.getValue(T002PartBinary.PART_2), CodePointCommandᶻᴰ.UNICODE);
CodePointᶻᴰ.INSTANCE.setArgumentUnicode(v0.getValue(T002PartBinary.PART_2), unicode);
CodePointᶻᴰ.INSTANCE.setCommand(v0.getValue(T002.PART_2), CodePointCommandᶻᴰ.UNICODE);
CodePointᶻᴰ.INSTANCE.setArgumentUnicode(v0.getValue(T002.PART_2), unicode);
CodePointᶻᴰ.INSTANCE.setCommand(v1.getValue(T002PartBinary.PART_1), CodePointCommandᶻᴰ.XY_MAX);
CodePointᶻᴰ.INSTANCE.setArgument(v1.getValue(T002PartBinary.PART_1), T002PartBinary.PART_1, xMax);
CodePointᶻᴰ.INSTANCE.setArgument(v1.getValue(T002PartBinary.PART_1), T002PartBinary.PART_2, yMax);
CodePointᶻᴰ.INSTANCE.setCommand(v1.getValue(T002.PART_1), CodePointCommandᶻᴰ.XY_MAX);
CodePointᶻᴰ.INSTANCE.setArgument(v1.getValue(T002.PART_1), T002ᖟ.PART_1, xMax);
CodePointᶻᴰ.INSTANCE.setArgument(v1.getValue(T002.PART_1), T002ᖟ.PART_2, yMax);
CodePointᶻᴰ.INSTANCE.setCommand(v1.getValue(T002PartBinary.PART_2), CodePointCommandᶻᴰ.XY_MIN);
CodePointᶻᴰ.INSTANCE.setArgument(v1.getValue(T002PartBinary.PART_2), T002PartBinary.PART_1, xMin);
CodePointᶻᴰ.INSTANCE.setArgument(v1.getValue(T002PartBinary.PART_2), T002PartBinary.PART_2, yMin);
CodePointᶻᴰ.INSTANCE.setCommand(v1.getValue(T002.PART_2), CodePointCommandᶻᴰ.XY_MIN);
CodePointᶻᴰ.INSTANCE.setArgument(v1.getValue(T002.PART_2), T002ᖟ.PART_1, xMin);
CodePointᶻᴰ.INSTANCE.setArgument(v1.getValue(T002.PART_2), T002ᖟ.PART_2, yMin);
CodePointᶻᴰ.INSTANCE.setCommand(v2.getValue(T002PartBinary.PART_1), CodePointCommandᶻᴰ.ADVANCE);
CodePointᶻᴰ.INSTANCE.setArgument(v2.getValue(T002PartBinary.PART_1), T002PartBinary.PART_1, advanceWidth);
CodePointᶻᴰ.INSTANCE.setArgument(v2.getValue(T002PartBinary.PART_1), T002PartBinary.PART_2, leftSideBearing);
CodePointᶻᴰ.INSTANCE.setCommand(v2.getValue(T002.PART_1), CodePointCommandᶻᴰ.ADVANCE);
CodePointᶻᴰ.INSTANCE.setArgument(v2.getValue(T002.PART_1), T002ᖟ.PART_1, advanceWidth);
CodePointᶻᴰ.INSTANCE.setArgument(v2.getValue(T002.PART_1), T002ᖟ.PART_2, leftSideBearing);
CodePointᶻᴰ.INSTANCE.setCommand(v2.getValue(T002PartBinary.PART_2), CodePointCommandᶻᴰ.NOP);
CodePointᶻᴰ.INSTANCE.setCommand(v2.getValue(T002.PART_2), CodePointCommandᶻᴰ.NOP);
tongs.add(v0);
tongs.add(v1);
@ -270,9 +270,9 @@ public class TestConvFont {
int x = (int) Float.parseFloat(atts.getValue("x"));
int y = (int) Float.parseFloat(atts.getValue("y"));
T002PartBinary part = T002PartBinary.PART_1;
if (CodePointCommandᶻᴰ.NOP != CodePointᶻᴰ.INSTANCE.getCommand(point.getValue(T002PartBinary.PART_1))) {
part = T002PartBinary.PART_2;
T002 part = T002ᖟ.PART_1;
if (CodePointCommandᶻᴰ.NOP != CodePointᶻᴰ.INSTANCE.getCommand(point.getValue(T002.PART_1))) {
part = T002.PART_2;
}
if (onCurve) {
if (startPoint) {
@ -287,13 +287,13 @@ public class TestConvFont {
CodePointᶻᴰ.INSTANCE.setCommand(point.getValue(part), CodePointCommandᶻᴰ.XY_OFF_CURVE);
}
}
CodePointᶻᴰ.INSTANCE.setArgument(point.getValue(part), T002PartBinary.PART_1, x);
CodePointᶻᴰ.INSTANCE.setArgument(point.getValue(part), T002PartBinary.PART_2, y);
if (part == T002PartBinary.PART_2) {
CodePointᶻᴰ.INSTANCE.setArgument(point.getValue(part), T002.PART_1, x);
CodePointᶻᴰ.INSTANCE.setArgument(point.getValue(part), T002.PART_2, y);
if (part == T002.PART_2) {
tongs.add(point);
point = new V072Tong();
CodePointᶻᴰ.INSTANCE.setCommand(point.getValue(T002PartBinary.PART_1), CodePointCommandᶻᴰ.NOP);
CodePointᶻᴰ.INSTANCE.setCommand(point.getValue(T002PartBinary.PART_2), CodePointCommandᶻᴰ.NOP);
CodePointᶻᴰ.INSTANCE.setCommand(point.getValue(T002.PART_1), CodePointCommandᶻᴰ.NOP);
CodePointᶻᴰ.INSTANCE.setCommand(point.getValue(T002.PART_2), CodePointCommandᶻᴰ.NOP);
}
if (startPoint) {
startPoint = false;