mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix trimming of second line in Recombine Lines

Browse source
This commit is contained in:
tophf 2013-11-01 08:44:21 -07:00 committed by Thomas Goyne
parent dd325acd81
commit 3948bdc6f4
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
aegisub/src/command/edit.cpp
View file

@ -852,8 +852,8 @@ void expand_times(AssDialogue *src, AssDialogue *dst) {
dst->End = std::max(dst->End, src->End); dst->End = std::max(dst->End, src->End);
} }
bool check_lines(AssDialogue *d1, AssDialogue *d2, bool (*pred)(std::string const&, std::string const&)) { bool check_start(AssDialogue *d1, AssDialogue *d2) {
if (pred(d1->Text.get(), d2->Text.get())) { if (boost::starts_with(d1->Text.get(), d2->Text.get())) {
d1->Text = trim_text(d1->Text.get().substr(d2->Text.get().size())); d1->Text = trim_text(d1->Text.get().substr(d2->Text.get().size()));
expand_times(d1, d2); expand_times(d1, d2);
return true; return true;
@ -861,12 +861,13 @@ bool check_lines(AssDialogue *d1, AssDialogue *d2, bool (*pred)(std::string cons
return false; return false;
} }
bool check_start(AssDialogue *d1, AssDialogue *d2) {
return check_lines(d1, d2, &boost::starts_with<std::string, std::string>);
}
bool check_end(AssDialogue *d1, AssDialogue *d2) { bool check_end(AssDialogue *d1, AssDialogue *d2) {
return check_lines(d1, d2, &boost::ends_with<std::string, std::string>); if (boost::ends_with(d1->Text.get(), d2->Text.get())) {
d1->Text = trim_text(d1->Text.get().substr(0, d1->Text.get().size() - d2->Text.get().size()));
expand_times(d1, d2);
return true;
}
return false;
} }
} }