Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore conflict markers in ConvertUCD #444

Merged
merged 13 commits into from
May 2, 2023
+5 −0
Merged

Ignore conflict markers in ConvertUCD #444

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e79448b
Ignore merge markers in ConvertUCD
eggrobin Apr 18, 2023
dfee869
spotless
eggrobin Apr 18, 2023
f5e4ab7
Fix the Vertical_Orientation from ToolUnicodePropertySource
eggrobin Apr 19, 2023
742afdf
Also generate EAW and VO
eggrobin Apr 19, 2023
77b4aa9
Update legacy comment
eggrobin Apr 19, 2023
a2b01f8
Regenerate UCD
eggrobin Apr 19, 2023
d9155f2
Merge remote-tracking branch 'la-vache/main' into regenerate-unicodedata
eggrobin Apr 19, 2023
9389498
Surprisingly straightforward after all, and found a bug.
eggrobin Apr 20, 2023
9d2edc2
weird corners
eggrobin Apr 20, 2023
7d545ae
spotless and all
eggrobin Apr 20, 2023
3c4a8fc
fields & close
eggrobin Apr 20, 2023
a4d1fae
Merge branch 'regenerate-unicodedata' into deconfliction
eggrobin Apr 20, 2023
9884c40
Merge remote-tracking branch 'la-vache/main' into deconfliction
eggrobin Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions unicodetools/src/main/java/org/unicode/text/UCD/ConvertUCD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,11 @@ void readSemi(String[] labels) throws Exception {
if (line == null) {
break;
}
if (line.startsWith("<<<<<<<")
|| line.startsWith("=======")
|| line.startsWith(">>>>>>>")) {
continue;
}
if (SHOW && (lineNumber % 500) == 0) {
System.out.println("//" + lineNumber + ": '" + line + "'");
}
Expand Down