separate course and song translations, so they don't interfere

with one another

stepmania/Translation.dat

@@ -22,6 +22,7 @@
 # first loaded.  Delete the files in the "Cache" directory after making
 # changes.
 
+[Songs]
 TitleFrom: Candy
 ArtistFrom: Luv.*
 TitleTo: CANDY☆
@@ -307,7 +308,7 @@ ArtistTo: 堀江由衣
 ArtistFrom: (Nobuo Uematsu)|(Uematsu Nobuo)
 ArtistTo: 植松伸夫
 
-# Courses:
+[Courses]
 TitleFrom: Kidou
 TitleTo: 鬼道
 *

stepmania/src/Course.cpp

@@ -231,7 +231,7 @@ void Course::LoadFromCRSFile( CString sPath )
 		else
 			LOG->Trace( "Unexpected value named '%s'", sValueName.GetString() );
 	}
-	static TitleSubst tsub;
+	static TitleSubst tsub("courses");
 
 	CString ignore;
 	tsub.Subst(m_sName, ignore, ignore,

stepmania/src/Song.cpp

@@ -583,7 +583,7 @@ void Song::TidyUpData()
 
 void Song::TranslateTitles()
 {
-	static TitleSubst tsub;
+	static TitleSubst tsub("songs");
 
 	tsub.Subst(m_sMainTitle, m_sSubTitle, m_sArtist,
 				m_sMainTitleTranslit, m_sSubTitleTranslit, m_sArtistTranslit);

stepmania/src/TitleSubstitution.cpp

@@ -15,8 +15,7 @@ struct TitleTrans
 	TitleTrans(CString tf, CString sf, CString af, CString tt, CString st, CString at,
 			   bool translit_):
 		TitleFrom(tf), SubFrom(sf), ArtistFrom(af),
-			TitleTo(tt), SubTo(st), ArtistTo(at),
+			TitleTo(tt), SubTo(st), ArtistTo(at), translit(translit_) { }
-			translit(translit_) { }
 
 	bool Matches(CString title, CString sub, CString artist);
 };
@@ -33,7 +32,8 @@ bool TitleTrans::Matches(CString title, CString sub, CString artist)
 }
 
 void TitleSubst::AddTrans(const CString &tf, const CString &sf, const CString &af,
-		      const CString &tt, const CString &st, const CString &at, bool translit)
+		      const CString &tt, const CString &st, const CString &at,
+			  bool translit)
 {
 	ttab.push_back(new TitleTrans(tf, sf, af, tt, st, at, translit));
 }
@@ -70,23 +70,23 @@ void TitleSubst::Subst(CString &title, CString &subtitle, CString &artist,
 }
 
 
-TitleSubst::TitleSubst()
+TitleSubst::TitleSubst(const CString &section)
 {
-	Load("Translation.dat");
+	Load("Translation.dat", section);
 }
 
-void TitleSubst::Load(const CString &filename)
+void TitleSubst::Load(const CString &filename, const CString &section)
 {
 	ifstream f;
 	f.open(filename);
 	if(!f.good()) return;
-	while(!f.eof())
-	{
 	CString TitleFrom, ArtistFrom, SubtitleFrom, TitleTo, ArtistTo, SubtitleTo;
 	bool translit = true;
+	CString CurrentSection;
 
 	while(!f.eof())
 	{
+
 		CString line;
 		if(!getline(f, line)) continue;
 
@@ -100,21 +100,20 @@ void TitleSubst::Load(const CString &filename)
 		TrimLeft(line);
 		TrimRight(line);
 
+		if(line.size() == 0) continue; /* blank */
+		if(line[0] == '#') continue; /* comment */
+
+
 		if(!line.CompareNoCase("DontTransliterate"))
 		{
 			translit = false;
 			continue;
 		}
 
-			if(line.size() == 0) continue; /* blank */
-			if(line[0] == '#') continue; /* comment */
-
-			if(line[0] == '*') break;
-
-			/* x: y */
-
 		unsigned pos = line.find_first_of(':');
-			if(pos == string::npos) continue;
+		if(pos != string::npos)
+		{
+			/* x: y */
 			CString id = line.substr(0, pos);
 			CString txt = line.substr(pos+1);
 			TrimLeft(txt);
@@ -127,13 +126,29 @@ void TitleSubst::Load(const CString &filename)
 			else if(!id.CompareNoCase("SubtitleTo")) SubtitleTo = txt;
 		}
 
+		/* Add the translation if this is a terminator (*) or section
+		 * marker ([xxx]). */
+		if(line[0] == '*' || line[0] == '[')
+		{
 			/* Surround each regex with ^(...)$, to force all comparisons to default
 			 * to being a full-line match.  (Add ".*" manually if htis isn't wanted.) */
 			if(TitleFrom.size()) TitleFrom = "^(" + TitleFrom + ")$";
 			if(ArtistFrom.size()) ArtistFrom = "^(" + ArtistFrom + ")$";
 			if(SubtitleFrom.size()) SubtitleFrom = "^(" + SubtitleFrom + ")$";
 
+			if(!CurrentSection.CompareNoCase(section) &&
+			   (TitleFrom.size() || SubtitleFrom.size() || ArtistFrom.size()))
 				AddTrans(TitleFrom, SubtitleFrom, ArtistFrom, TitleTo, SubtitleTo, ArtistTo, translit);
+			
+			/* Reset. */
+			TitleFrom = ArtistFrom = SubtitleFrom = TitleTo = ArtistTo = SubtitleTo = "";
+			translit = true;
+		}
+
+		if(line[0] == '[' && line[line.size()-1] == ']')
+		{
+			CurrentSection = line.substr(1, line.size()-2);
+		}
 	}
 }
 

stepmania/src/TitleSubstitution.h

@@ -10,10 +10,10 @@ class TitleSubst
 	void AddTrans(const CString &tf, const CString &sf, const CString &af,
 			   const CString &tt, const CString &st, const CString &at, bool translit);
 public:
-	TitleSubst();
+	TitleSubst(const CString &section);
 	~TitleSubst();
 
-	void Load(const CString &filename);
+	void Load(const CString &filename, const CString &section);
 
 	void Subst(CString &title, CString &sub, CString &artist,
 					   CString &ttitle, CString &tsub, CString &tartist);