use alternates

stepmania/src/MusicList.cpp

@@ -59,13 +59,21 @@ void MusicList::AddSongsToGroup(const vector<Song*> &Songs)
 			CString sTitle = Songs[iIndex]->GetFullDisplayTitle();
 			// TODO:  Move this crop threshold into a theme metric or make automatic based on column width
 			if( sTitle.GetLength() > 40 )
-			{
+				sTitle = sTitle.Left( 37 ) + "...";
-				sTitle = sTitle.Left( 37 );
+
-				sTitle += "...";
+			CString sTrTitle = Songs[iIndex]->GetFullTranslitTitle();
-			}
+			if( sTrTitle.GetLength() > 40 )
-			sText += sTitle + "\n";
+				sTrTitle = sTrTitle.Left( 37 ) + "...";
+
+			/* If the main title isn't complete for this font, and we have a translit,
+			 * use it. */
+			if(m_textTitles[c].StringWillUseAlternate(sTitle, sTrTitle))
+				sText += sTrTitle;
+			else
+				sText += sTitle;
+			sText += "\n";
 		}
-		m_ContentsText[m_ContentsText.size()-1].ContentsText[c] = sText;
+		m_ContentsText[group].ContentsText[c] = sText;
 	}
 
 }

stepmania/src/ScreenMusicScroll.cpp

@@ -159,7 +159,7 @@ ScreenMusicScroll::ScreenMusicScroll()
 	{
 		Song* pSong = arraySongs[i];
 		m_textLines[m_iNumLines].LoadFromFont( THEME->GetPathTo("Fonts","music scroll") );
-		m_textLines[m_iNumLines].SetText( pSong->GetFullDisplayTitle() );
+		m_textLines[m_iNumLines].SetText( pSong->GetFullDisplayTitle(), pSong->GetFullTranslitTitle() );
 		m_textLines[m_iNumLines].SetDiffuse( SONGMAN->GetSongColor(pSong) );
 		m_textLines[m_iNumLines].SetZoom( TEXT_ZOOM );
 

stepmania/src/TransitionOniFade.cpp

@@ -104,6 +104,7 @@ void TransitionOniFade::UpdateSongText()
 {
 	Song* pSong = GAMESTATE->m_pCurSong;
 	ASSERT( pSong );
-	m_textSongInfo.SetText( pSong->GetFullDisplayTitle() + "\n" + pSong->m_sArtist + "\n");
+	m_textSongInfo.SetText( pSong->GetFullDisplayTitle() + "\n" + pSong->GetDisplayArtist(),
+							pSong->GetFullTranslitTitle() + "\n" + pSong->GetTranslitArtist() );
 	m_Banner.LoadFromSong( pSong );
 }