mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix handling of unclosed override blocks starting at position 0

Browse source
This commit is contained in:
Thomas Goyne 2012-11-11 17:09:16 -08:00
parent 7ca7b1d934
commit b3c1af11b7
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/libaegisub/ass/dialogue_parser.cpp
View file

@ -186,7 +186,7 @@ public:
// all tokens after the last override block are TEXT // all tokens after the last override block are TEXT
for (size_t i = tokens.size(); i > 0; --i) { for (size_t i = tokens.size(); i > 0; --i) {
if (tokens[i - 1].type == dt::OVR_END) { if (tokens[i - 1].type == dt::OVR_END) {
last_ovr_end = i - 1; last_ovr_end = i;
break; break;
} }
} }
@ -197,7 +197,7 @@ public:
case dt::LINE_BREAK: break; case dt::LINE_BREAK: break;
case dt::TEXT: SplitText(i); break; case dt::TEXT: SplitText(i); break;
case dt::TAG_NAME: case dt::TAG_NAME:
if (i > last_ovr_end) { if (i + 1 > last_ovr_end) {
SplitText(i); SplitText(i);
break; break;
} }
@ -221,7 +221,7 @@ public:
} }
break; break;
default: default:
if (i > last_ovr_end) if (i + 1 > last_ovr_end)
SplitText(i); SplitText(i);
break; break;
} }

8
aegisub/tests/libaegisub_word_split.cpp
View file

@ -131,5 +131,13 @@ TEST(lagi_word_split, unclosed_ovr) {
EXPECT_EQ(dt::TEXT, tokens[1].type); EXPECT_EQ(dt::TEXT, tokens[1].type);
EXPECT_EQ(dt::TEXT, tokens[2].type); EXPECT_EQ(dt::TEXT, tokens[2].type);
EXPECT_EQ(dt::WORD, tokens[3].type); EXPECT_EQ(dt::WORD, tokens[3].type);
text = "{";
tokens.clear();
tokens.emplace_back(dt::OVR_BEGIN, 1);
SplitWords(text, tokens);
ASSERT_EQ(1u, tokens.size());
EXPECT_EQ(dt::TEXT, tokens[0].type);
} }