- Added ã to lyric validation exclusion

rscustom · Apr 29, 2017 · 69be634 · 69be634
1 parent 3ff0b52
commit 69be634
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs b/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs
@@ -1651,8 +1651,11 @@ public void btnPackageGenerate_Click(object sender = null, EventArgs e = null)
 
                 // showlight and vocal arrangements
                 if (arr.ArrangementType == ArrangementType.ShowLight)
+                {
+                    Song2014.WriteXmlComments(arr.SongXml.File, arr.XmlComments);
                     continue;
-
+                }
+
                 if (arr.ArrangementType == ArrangementType.Vocal)
                 {
                     var oldXml = GeneralExtensions.CopyToTempFile(arr.SongXml.File);

diff --git a/RocksmithTookitGUI/Resources/BetaInfo.rtf b/RocksmithTookitGUI/Resources/BetaInfo.rtf
diff --git a/RocksmithToolkitLib/DLCPackage/DLCPackageCreator.cs b/RocksmithToolkitLib/DLCPackage/DLCPackageCreator.cs
@@ -567,9 +567,9 @@ private static void GenerateRS2014SongPsarc(Stream output, DLCPackageData info,
                     }
                     else
                     {
-                        // Generate new Showlights
+                        // Generate Showlights 'cst_showlights.xml'
                         var showlight = new Showlights(info);
-                        // TODO: determine min number of showlight elements to still be valid
+                        // TODO: determine minimum number of showlight elements to still be valid
                         if (showlight.ShowlightList.Count > 5)
                         {
                             showlight.Serialize(showlightStream);

diff --git a/RocksmithToolkitLib/Extensions/StringExtensions.cs b/RocksmithToolkitLib/Extensions/StringExtensions.cs
@@ -93,7 +93,7 @@ public static string GetValidAtaSpaceName(this string value)
             // may need to be escaped \t\n\f\r#$()*+.?[\^{|  ... '-' needs to be escaped if not at the beginning or end of regex sequence
             // allow use of only these special characters \\-_ /&.:',!?()\"#
             // allow use of alphanumerics a-zA-Z0-9
-            // tested and working ... Üuber!@#$%^&*()_+=-09{}][":';<>.,?/ñice
+            // tested and working ... Üuber!@#$%^&*()_+=-09{}][":';<>.,?/ñice 
 
             Regex rgx = new Regex("[^a-zA-Z0-9\\-_/&',!.?()\"#\\p{L} ]*");
             value = rgx.Replace(value, "");
@@ -193,8 +193,11 @@ public static string GetValidLyric(this string value)
         {
             // standard ODLC lyric character set
             //!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_abcdefghijklmnopqrstuvwxyz{|}~¡¢¥¦§¨ª«°²³´•¸¹º»¼½¾¿ÀÁÂÄÅÆÇÈÉÊËÌÎÏÑÒÓÔÖØÙÚÛÜÞßàáâäåæçèéêëìíîïñòóôöøùúûüŒœŠšž„…€™␀★➨
+            // string validSpecialCharacters = "!\"#$%&'()*+,-./:;<=>?@[\\]^_{|}~¡¢¥¦§¨ª«°²³´•¸¹º»¼½¾¿ÀÁÂÄÅÆÇÈÉÊËÌÎÏÑÒÓÔÖØÙÚÛÜÞßàáâäåæçèéêëìíîïñòóôöøùúûüŒœŠšž€™␀";
+            // this is better (includes ã) special character validation
+            string validSpecialCharacters = "!\"#$%&'()*+,-./:;<=>?@[\\]^_{|}~\\p{L}";
             string validAlphaNumerics = "a-zA-Z0-9";
-            string validSpecialCharacters = "!\"#$%&'()*+,-./:;<=>?@[\\]^_{|}~¡¢¥¦§¨ª«°²³´•¸¹º»¼½¾¿ÀÁÂÄÅÆÇÈÉÊËÌÎÏÑÒÓÔÖØÙÚÛÜÞßàáâäåæçèéêëìíîïñòóôöøùúûüŒœŠšž€™␀";
+
             Regex rgx = new Regex("[^" + validAlphaNumerics + validSpecialCharacters + "]*");
             value = rgx.Replace(value, "");
             return value;

diff --git a/VersionInfo.txt b/VersionInfo.txt
@@ -1 +1 @@
-4733bc88 
+3ff0b529