more descriptive names for some script functions.

TODO: document the changes

src/script/functions/basic.cpp

@@ -299,25 +299,30 @@ SCRIPT_FUNCTION(pow) {
 // ----------------------------------------------------------------------------- : String stuff
 
 // convert a string to upper case
-SCRIPT_FUNCTION(to_upper) {
+SCRIPT_FUNCTION(to_upper_case) {
 	SCRIPT_PARAM_C(String, input);
 	SCRIPT_RETURN(input.Upper());
 }
 
 // convert a string to lower case
-SCRIPT_FUNCTION(to_lower) {
+SCRIPT_FUNCTION(to_lower_case) {
 	SCRIPT_PARAM_C(String, input);
 	SCRIPT_RETURN(input.Lower());
 }
 
 // convert a string to title case
-SCRIPT_FUNCTION(to_title) {
+SCRIPT_FUNCTION(to_title_case) {
 	SCRIPT_PARAM_C(String, input);
 	SCRIPT_RETURN(capitalize(input.Lower()));
 }
+// convert a string to sentence case
+SCRIPT_FUNCTION(to_sentence_case) {
+	SCRIPT_PARAM_C(String, input);
+	SCRIPT_RETURN(capitalize_sentence(input.Lower()));
+}
 
 // reverse a string
-SCRIPT_FUNCTION(reverse) {
+SCRIPT_FUNCTION(reverse_text) {
 	SCRIPT_PARAM_C(String, input);
 	reverse(input.begin(), input.end());
 	SCRIPT_RETURN(input);
@@ -410,7 +415,7 @@ String replace_tag_contents(String input, const String& tag, const ScriptValueP&
 }
 
 // Replace the contents of a specific tag
-SCRIPT_FUNCTION(tag_contents) {
+SCRIPT_FUNCTION(replace_tag_contents) {
 	SCRIPT_PARAM_C(String, input);
 	SCRIPT_PARAM_C(String, tag);
 	SCRIPT_PARAM_C(ScriptValueP, contents);
@@ -714,10 +719,10 @@ void init_script_basic_functions(Context& ctx) {
 	ctx.setVariable(_("to_date"),              script_to_date);
 	ctx.setVariable(_("to_code"),              script_to_code);
 	// math
-	ctx.setVariable(_("abs"),                  script_abs);
 	ctx.setVariable(_("random_real"),          script_random_real);
 	ctx.setVariable(_("random_int"),           script_random_int);
 	ctx.setVariable(_("random_boolean"),       script_random_boolean);
+	ctx.setVariable(_("abs"),                  script_abs);
 	ctx.setVariable(_("sin"),                  script_sin);
 	ctx.setVariable(_("cos"),                  script_cos);
 	ctx.setVariable(_("tan"),                  script_tan);
@@ -730,29 +735,35 @@ void init_script_basic_functions(Context& ctx) {
 	ctx.setVariable(_("sqrt"),                 script_sqrt);
 	ctx.setVariable(_("pow"),                  script_pow);
 	// string
-	ctx.setVariable(_("to_upper"),             script_to_upper);
-	ctx.setVariable(_("to_lower"),             script_to_lower);
-	ctx.setVariable(_("to_title"),             script_to_title);
-	ctx.setVariable(_("reverse"),              script_reverse);
+	ctx.setVariable(_("to_upper_case"),        script_to_upper_case);
+	ctx.setVariable(_("to_lower_case"),        script_to_lower_case);
+	ctx.setVariable(_("to_title_case"),        script_to_title_case);
+	ctx.setVariable(_("to_sentence_case"),     script_to_sentence_case);
+	ctx.setVariable(_("to_upper"),             script_to_upper_case); // old name
+	ctx.setVariable(_("to_lower"),             script_to_lower_case); // old name
+	ctx.setVariable(_("to_title"),             script_to_title_case); // old name
+	ctx.setVariable(_("reverse"),              script_reverse_text); // old name
+	ctx.setVariable(_("reverse_text"),         script_reverse_text);
 	ctx.setVariable(_("trim"),                 script_trim);
 	ctx.setVariable(_("substring"),            script_substring);
 	ctx.setVariable(_("contains"),             script_contains);
 	ctx.setVariable(_("format"),               script_format);
-	ctx.setVariable(_("format_rule"),          intrusive(new ScriptRule(script_format)));
+	ctx.setVariable(_("format_rule"),          intrusive(new ScriptRule(script_format))); // compatability
 	ctx.setVariable(_("curly_quotes"),         script_curly_quotes);
 	ctx.setVariable(_("regex_escape"),         script_regex_escape);
 	ctx.setVariable(_("sort_text"),            script_sort_text);
-	ctx.setVariable(_("sort_rule"),            intrusive(new ScriptRule(script_sort_text)));
+	ctx.setVariable(_("sort_rule"),            intrusive(new ScriptRule(script_sort_text))); // compatability
 	// tagged string
-	ctx.setVariable(_("tag_contents"),         script_tag_contents);
+	ctx.setVariable(_("tag_contents"),         script_replace_tag_contents); // old name
+	ctx.setVariable(_("replace_tag_contents"), script_replace_tag_contents);
 	ctx.setVariable(_("remove_tag"),           script_remove_tag);
 	ctx.setVariable(_("remove_tags"),          script_remove_tags);
-	ctx.setVariable(_("tag_contents_rule"),    intrusive(new ScriptRule(script_tag_contents)));
-	ctx.setVariable(_("tag_remove_rule"),      intrusive(new ScriptRule(script_remove_tag)));
+	ctx.setVariable(_("tag_contents_rule"),    intrusive(new ScriptRule(script_replace_tag_contents))); // compatability
+	ctx.setVariable(_("tag_remove_rule"),      intrusive(new ScriptRule(script_remove_tag))); // compatability
 	// collection
 	ctx.setVariable(_("position"),             script_position_of);
 	ctx.setVariable(_("length"),               script_length);
-	ctx.setVariable(_("number_of_items"),      script_number_of_items);
+	ctx.setVariable(_("number_of_items"),      script_number_of_items); // deprecated
 	ctx.setVariable(_("filter_list"),          script_filter_list);
 	ctx.setVariable(_("sort_list"),            script_sort_list);
 	ctx.setVariable(_("random_shuffle"),       script_random_shuffle);
@@ -760,6 +771,6 @@ void init_script_basic_functions(Context& ctx) {
 	ctx.setVariable(_("random_select_many"),   script_random_select_many);
 	// keyword
 	ctx.setVariable(_("expand_keywords"),      script_expand_keywords);
-	ctx.setVariable(_("expand_keywords_rule"), intrusive(new ScriptRule(script_expand_keywords)));
+	ctx.setVariable(_("expand_keywords_rule"), intrusive(new ScriptRule(script_expand_keywords))); // compatability
 	ctx.setVariable(_("keyword_usage"),        script_keyword_usage);
 }

src/script/functions/image.cpp

@@ -230,7 +230,8 @@ void init_script_image_functions(Context& ctx) {
 	ctx.setVariable(_("crop"),             script_crop);
 	ctx.setVariable(_("flip_horizontal"),  script_flip_horizontal);
 	ctx.setVariable(_("flip_vertical"),    script_flip_vertical);
-	ctx.setVariable(_("rotate"),           script_rotate);
+	ctx.setVariable(_("rotate"),           script_rotate); // old name
+	ctx.setVariable(_("rotate_image"),     script_rotate);
 	ctx.setVariable(_("drop_shadow"),      script_drop_shadow);
 	ctx.setVariable(_("symbol_variation"), script_symbol_variation);
 	ctx.setVariable(_("built_in_image"),   script_built_in_image);

src/script/functions/regex.cpp

@@ -252,8 +252,8 @@ void init_script_regex_functions(Context& ctx) {
 	ctx.setVariable(_("split_text"),           script_split_text);
 	ctx.setVariable(_("match"),                script_match_text); // compatability
 	ctx.setVariable(_("match_text"),           script_match_text);
-	ctx.setVariable(_("replace_rule"),         intrusive(new ScriptRule(script_replace_text)));
-	ctx.setVariable(_("filter_rule"),          intrusive(new ScriptRule(script_filter_text)));
-	ctx.setVariable(_("break_rule"),           intrusive(new ScriptRule(script_break_text)));
-	ctx.setVariable(_("match_rule"),           intrusive(new ScriptRule(script_match_text)));
+	ctx.setVariable(_("replace_rule"),         intrusive(new ScriptRule(script_replace_text))); // compatability
+	ctx.setVariable(_("filter_rule"),          intrusive(new ScriptRule(script_filter_text))); // compatability
+	ctx.setVariable(_("break_rule"),           intrusive(new ScriptRule(script_break_text))); // compatability
+	ctx.setVariable(_("match_rule"),           intrusive(new ScriptRule(script_match_text))); // compatability
 }