Merge trunk r3192 into 2.1.8. It builds so it must be good. Updates #929.

Originally committed to SVN as r3193.

aegisub/src/subs_grid.cpp

@@ -55,6 +55,7 @@
 #include "utils.h"
 #include "ass_override.h"
 #include "dialog_paste_over.h"
+#include "ass_karaoke.h"
 
 
 ///////////////
@@ -396,11 +397,14 @@ void SubtitlesGrid::OnJoinAsKaraoke (wxCommandEvent &event) {
 void SubtitlesGrid::OnSplitByKaraoke (wxCommandEvent &event) {
 	BeginBatch();
 	wxArrayInt sels = GetSelection();
+	bool didSplit = false;
 	for (int i = sels.size()-1; i >= 0; i--) {
-		SplitLineByKaraoke(sels[i]);
+		didSplit |= SplitLineByKaraoke(sels[i]);
+	}
+	if (didSplit) {
+		ass->FlagAsModified(_("splitting"));
+		CommitChanges();
 	}
-	ass->FlagAsModified(_("splitting"));
-	CommitChanges();
 	EndBatch();
 }
 
@@ -1023,7 +1027,7 @@ void SubtitlesGrid::PasteLines(int n,bool pasteOver) {
 
 /////////////////////////
 // Delete selected lines
-void SubtitlesGrid::DeleteLines(wxArrayInt target) {
+void SubtitlesGrid::DeleteLines(wxArrayInt target, bool flagModified) {
 	// Check if it's wiping file
 	int deleted = 0;
 
@@ -1044,8 +1048,10 @@ void SubtitlesGrid::DeleteLines(wxArrayInt target) {
 	// Update
 	UpdateMaps();
 	AdjustScrollbar();
-	ass->FlagAsModified(_("delete"));
+	if (flagModified) {
-	CommitChanges();
+		ass->FlagAsModified(_("delete"));
+		CommitChanges();
+	}
 
 	// Update selected line
 	int newSelected = MID(0, editBox->linen,GetRows() - 1);
@@ -1321,90 +1327,45 @@ void SubtitlesGrid::SplitLine(int n,int pos,int mode,wxString textIn) {
 // Splits the line into as many new lines as there are karaoke syllables,
 // timed as the syllables.
 // DOES NOT FLAG AS MODIFIED OR COMMIT CHANGES
-void SubtitlesGrid::SplitLineByKaraoke(int lineNumber) {
+// Returns true if changes were made.
+bool SubtitlesGrid::SplitLineByKaraoke(int lineNumber) {
 	AssDialogue *line = GetDialogue(lineNumber);
+
 	line->ParseASSTags();
-
+	AssKaraokeVector syls;
-	AssDialogue *nl = new AssDialogue(line->GetEntryData());
+	ParseAssKaraokeTags(line, syls);
-	nl->Text = _T("");
-	nl->End = nl->Start;
-	nl->UpdateData();
-	int kcount = 0;
-	int start_time = line->Start.GetMS();
-
-	// copying lost of code from automation.cpp here
-	// maybe it should be refactored, since a similar proc is also needed in audio_karaoke ?
-	for (std::vector<AssDialogueBlock*>::iterator block = line->Blocks.begin(); block != line->Blocks.end(); block++) {
-		switch ((*block)->GetType()) {
-			case BLOCK_BASE:
-				throw wxString(_T("BLOCK_BASE found processing dialogue blocks. This should never happen."));
-
-			case BLOCK_PLAIN:
-				nl->Text += (*block)->text;
-				break;
-
-			case BLOCK_DRAWING:
-				nl->Text += (*block)->text;
-				break;
-
-			case BLOCK_OVERRIDE: {
-				bool brackets_open = false;
-				std::vector<AssOverrideTag*> &tags = (*block)->GetAsOverride(*block)->Tags;
-
-				for (std::vector<AssOverrideTag*>::iterator tag = tags.begin(); tag != tags.end(); tag++) {
-					if (!(*tag)->Name.Mid(0,2).CmpNoCase(_T("\\k")) && (*tag)->IsValid()) {
-						// it's a karaoke tag
-						if (brackets_open) {
-							nl->Text += _T("}");
-							brackets_open = false;
-						}
-						if (nl->Text == _T("")) {
-							// don't create blank lines
-							delete nl;
-						} else {
-							InsertLine(nl, lineNumber+kcount, true, false);
-							kcount++;
-						}
-						nl = new AssDialogue(line->GetEntryData());
-						nl->Text = _T("");
-						nl->Start.SetMS(start_time);
-						nl->End.SetMS(start_time + (*tag)->Params[0]->AsInt()*10);
-						nl->UpdateData();
-						start_time = nl->End.GetMS();;
-					} else {
-						if (!brackets_open) {
-							nl->Text += _T("{");
-							brackets_open = true;
-						}
-						nl->Text += (*tag)->ToString();
-					}
-				}
-
-				if (brackets_open) {
-					nl->Text += _T("}");
-				}
-
-				break;}
-
-		}
-	}
-
-	if (nl->Text == _T("")) {
-		// don't create blank lines
-		delete nl;
-	} else {
-		InsertLine(nl, lineNumber+kcount, true, false);
-		kcount++;
-	}
-
-	// POSSIBLE BUG/LEAK! If the above code throws an exception, the blocks are never cleared!!
 	line->ClearBlocks();
 
+	// If there's only 1 or 0 syllables, splitting would be counter-productive.
+	// 1 syllable means there's no karaoke tags in the line at all and that is
+	// the case that triggers bug #929.
+	if (syls.size() < 2) return false;
+
+	// Insert a new line for each syllable
+	int start_ms = line->GetStartMS();
+	int nextpos = lineNumber;
+	for (AssKaraokeVector::iterator syl = syls.begin(); syl != syls.end(); ++syl)
+	{
+		// Skip blank lines
+		if (syl->unstripped_text.IsEmpty()) continue;
+
+		AssDialogue *nl = new AssDialogue(line->GetEntryData());
+		nl->SetStartMS(start_ms);
+		start_ms += syl->duration * 10;
+		nl->SetEndMS(start_ms);
+		nl->Text = syl->unstripped_text;
+		nl->UpdateData();
+		InsertLine(nl, nextpos++, true, false);
+	}
+
+	// Remove the source line
 	{
 		wxArrayInt oia;
 		oia.Add(lineNumber);
-		DeleteLines(oia);
+		DeleteLines(oia, false);
 	}
+
+	return true;
 }
 
 

aegisub/src/subs_grid.h

@@ -116,7 +116,7 @@ public:
 	void JoinAsKaraoke(int first,int last);
 	void AdjoinLines(int first,int last,bool setStart);
 	void SplitLine(int lineNumber,int splitPosition,int mode,wxString splitText = _T(""));
-	void SplitLineByKaraoke(int lineNumber);
+	bool SplitLineByKaraoke(int lineNumber);
 	void DuplicateLines(int first,int last,bool nextFrame=false);
 
 	void SwapLines(int line1,int line2);
@@ -124,7 +124,7 @@ public:
 	void ShiftLineByFrames(int lineNumber,int len,int type);
 
 	void InsertLine(AssDialogue *line,int position,bool insertAfter,bool update=true);
-	void DeleteLines(wxArrayInt lines);
+	void DeleteLines(wxArrayInt lines, bool flagModified=true);
 
 	void CopyLines(wxArrayInt lines);
 	void CutLines(wxArrayInt lines);