format_caption/format_varname: split words on camelCase

diff --git a/format.php b/format.php
index 17d0461..e0818fd 100644 (file)
--- a/format.php
+++ b/format.php
@@ -19,6 +19,7 @@
 # This file contains basic encodings
 
 function format_caption($str) {
+       $str = preg_replace("/([a-z])([A-Z])/", "\\1 \\2", $str); # split words on camelCase
        $str = str_replace('_', ' ', $str);
        $str = ucwords($str);
        return $str;
@@ -163,6 +164,7 @@ function format_image_w_h_thumb_w_h($str) {
 }
 
 function format_varname($str) {
+       $str = preg_replace("/([a-z])([A-Z])/", "\\1_\\2", $str); # split words on camelCase
        $str = strtolower($str);
        $str = ereg_replace('[^a-z0-9_]', '_', $str);
        return ereg_replace('^[0-9]*', '', $str);