Merge branch 'py-fix' into 'pregmod-master'

Py fix for _S

See merge request pregmodfan/fc-pregmod!7897

devTools/Script to convert SC to JS/SC to JS 1.py

@@ -56,7 +56,6 @@ editor.rereplace(r"%/", r"*/")
 # JS
 editor.rereplace(r" == ", r" === ")
 editor.rereplace(r" != ", r" !== ")
-editor.rereplace(r"_S\.", r"S.")
 
 #fix pronouns
 editor.rereplace(r"V\.Hers", r"\${Hers}")
@@ -99,9 +98,12 @@ editor.rereplace(r"_hers2", r"\${_hers2}")
 #look for variables embedded in literals
 editor.rereplace(r"(	r.push[^;]*?)(V\.[^ ,<'`]*)", r"\1${\2}")
 editor.rereplace(r"(	r.push[^;]*?)(slave\.[^ ,<'`]*)", r"\1${\2}")
-editor.rereplace(r"(	r.push[^;]*?)(S\.[^ ,<'`]*)", r"\1${\2}")
+editor.rereplace(r"(	r.push[^;]*?)(_S\.[^ ,<'`]*)", r"\1${\2}")
 editor.rereplace(r"(	r.push[^;]*?)( _[^ ,<'`]*)", r"\1${ \2}")
 
+#Delay fixing _S to simplify detection if it's embedded.
+editor.rereplace(r"_S\.", r"S.")
+
 #Cleanup
 editor.rereplace(r"\${He}adGirl", r"V.HeadGirl")
 editor.rereplace(r"\.}", r"}.")