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

ASS: Fix script header

Browse source 
Previously, Aegisub wrote its "Script generated by" lines without a
semicolon to mark them as comments. As a result, it prepended these
lines every time a script was loaded and then saved again. Fix.

Also fix a bug that caused the ASS parser to treat comments before
the [Script Info] section as non-blank lines, therefore inserting a
duplicate section header whenever such comments were present.
This commit is contained in:
Martin Herkt 2012-11-22 03:25:41 +01:00 committed by Thomas Goyne
parent 3f840ceec8
commit b1e40455ed
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
aegisub/src/ass_parser.cpp
View file

@ -66,16 +66,16 @@ void AssParser::ParseAttachmentLine(wxString const& data) {
} }
void AssParser::ParseScriptInfoLine(wxString const& data) { void AssParser::ParseScriptInfoLine(wxString const& data) {
// If the first nonblank line isn't a header pretend it starts with [Script Info]
if (target->Line.empty())
target->Line.push_back(*new AssEntry("[Script Info]", "[Script Info]"));
if (data.StartsWith(";")) { if (data.StartsWith(";")) {
// Skip stupid comments added by other programs // Skip stupid comments added by other programs
// Of course, we'll add our own in place later... ;) // Of course, we'll add our own in place later... ;)
return; return;
} }
// If the first nonblank line isn't a header pretend it starts with [Script Info]
if (target->Line.empty())
target->Line.push_back(*new AssEntry("[Script Info]", "[Script Info]"));
if (data.StartsWith("ScriptType:")) { if (data.StartsWith("ScriptType:")) {
wxString versionString = data.Mid(11).Trim(true).Trim(false).Lower(); wxString versionString = data.Mid(11).Trim(true).Trim(false).Lower();
int trueVersion; int trueVersion;

4
aegisub/src/subtitle_format_ass.cpp
View file

@ -86,8 +86,8 @@ void AssSubtitleFormat::ReadFile(AssFile *target, wxString const& filename, wxSt
void AssSubtitleFormat::WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const { void AssSubtitleFormat::WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const {
TextFileWriter file(filename, encoding); TextFileWriter file(filename, encoding);
file.WriteLineToFile(wxString("Script generated by Aegisub ") + GetAegisubLongVersionString()); file.WriteLineToFile(wxString("; Script generated by Aegisub ") + GetAegisubLongVersionString());
file.WriteLineToFile("http://www.aegisub.org/"); file.WriteLineToFile("; http://www.aegisub.org/");
bool ssa = filename.Right(4).Lower() == ".ssa"; bool ssa = filename.Right(4).Lower() == ".ssa";