Plork's modernization and boost killing, take two #182
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Ryan Lucia <[email protected]>
This reverts commit 2e6b26d. Taking out the BOM handling broke tests, so it'll probably break more stuff.
This partially reverts 62befa9 . This function is actually used in charset_conv_win.cpp
The previous logic didn't check if the match was on parts of decomposed characters, so it also failed the corresponding test.
This was clearly incorrect and probably just unfinished.
On newer mac sdks iconv_t is defined differently, so it's harder to just have a typedef for it.
wx uses a different string implementation here, and utf8_string() doesn't exist there.
Since luajit always first tried using dependency(), further calls of dependency() will also always return system luajit. meson.override_dependency() won't work. This makes luabins link system luajit where it's available while aegisub itself uses the subproject's luajit, which causes all kinds of fun issues and definitely didn't baffle me four hours... The added solution for this is horribly ugly (and also has problems when reconfiguring...) but it's the only one I found that works. Maybe it's better to always require interal luajit after all, or make the user choose with a meson option?
Previously this would fail on startup because the automation menu uses boost::locale::comparator. ... Or maybe the locale init change should just be reverted entirely? Or it should be something different? I don't really know.
This reverts commit 340fb9c.
Thinking about it some more, just copying the detection logic is probably the lesser evil here.
is_end being removed caused it to not output an empty segment at the end if the input ends with a delimiter, but existing usages relied on it doing that.
This reverts commit 04f4b26.
Apparently dependency('iconv') breaks when iconv is overridden??
windows.h was defining the ERROR macro, which shadowed the DialogueTokenType enum variant, which broke the lexer construction.
Include UBRK_WORD_IDEO and check the entire rules vec. This now matches the logic of boost::locale.
This reverts commit 3802bb7.
This was breaking things (libass) and doesn't seem to be needed any more.
These broke some things, in particular FromUTF8Unchecked seems to not like empty strings. Probably safer to just revert.
This reverts commit 256cbeb.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This should finally be ready now. Checked through all the changes and tested the parts that went through bigger refactors (i.e. karaoke mode and the kanji timer), and it now compiles and passes tests on all platforms.