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

Parse {} as an empty override block rather than an empty comment

Browse source 
Originally committed to SVN as r6164.
This commit is contained in:
Thomas Goyne 2011-12-26 22:21:02 +00:00
parent 04990e8694
commit 7b4759cc13
2 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
aegisub/src/ass_dialogue.cpp
View file

@ -243,34 +243,39 @@ wxString AssDialogue::GetSSAText () const {
void AssDialogue::ParseASSTags() {
ClearBlocks();
// Empty line, make an empty block
if (Text.empty()) {
Blocks.push_back(new AssDialogueBlockPlain);
return;
}
int drawingLevel = 0;
const size_t len = Text.size();
size_t cur = 0;
size_t end = 0;
while (cur < len) {
for (size_t len = Text.size(), cur = 0; cur < len; ) {
// Overrides block
if (Text[cur] == '{') {
++cur;
// Get contents of block
wxString work;
end = Text.find("}",cur);
size_t end = Text.find("}", cur);
if (end == wxString::npos) {
work = Text.substr(cur);
end = len;
cur = len;
}
else {
work = Text.substr(cur, end - cur);
cur = end + 1;
}
else work = Text.substr(cur,end-cur+1);
if (work.Find("\\") == wxNOT_FOUND) {
if (work.size() && work.Find("\\") == wxNOT_FOUND) {
//We've found an override block with no backslashes
//We're going to assume it's a comment and not consider it an override block
//Currently we'll treat this as a plain text block, but feel free to create a new class
AssDialogueBlockPlain *block = new AssDialogueBlockPlain;
block->text = work;
block->text = "{" + work + "}";
Blocks.push_back(block);
}
else {
work = work.substr(1,work.Len()-2); // trim { and }
// Create block
AssDialogueBlockOverride *block = new AssDialogueBlockOverride;
block->parent = this;
@ -286,20 +291,19 @@ void AssDialogue::ParseASSTags () {
}
}
}
// Increase
cur = end+1;
}
// Plain-text/drawing block
else {
wxString work;
end = Text.find("{",cur);
size_t end = Text.find("{",cur);
if (end == wxString::npos) {
work = Text.substr(cur);
end = len;
cur = len;
}
else {
work = Text.substr(cur, end - cur);
cur = end;
}
else work = Text.substr(cur,end-cur);
// Plain-text
if (drawingLevel == 0) {
@ -307,7 +311,6 @@ void AssDialogue::ParseASSTags () {
block->text = work;
Blocks.push_back(block);
}
// Drawing
else {
AssDialogueBlockDrawing *block = new AssDialogueBlockDrawing;
@ -315,17 +318,8 @@ void AssDialogue::ParseASSTags () {
block->Scale = drawingLevel;
Blocks.push_back(block);
}
cur = end;
}
}
// Empty line, make an empty block
if (len == 0) {
AssDialogueBlockPlain *block = new AssDialogueBlockPlain;
block->text = "";
Blocks.push_back(block);
}
}
void AssDialogue::StripTags () {

2
aegisub/src/ass_karaoke.cpp
View file

@ -74,7 +74,7 @@ void AssKaraoke::SetLine(AssDialogue *line, bool auto_split) {
if (dynamic_cast<AssDialogueBlockPlain*>(block)) {
// treat comments as overrides rather than dialogue
if (block->text.size() >= 2 && block->text[0] == '{')
if (block->text[0] == '{')
syl.ovr_tags[syl.text.size()] += block->text;
else
syl.text += block->text;