Changeset 653 for trunk/lib

Timestamp:

Nov 28, 2018 1:40:13 AM (5 years ago)

Author:

anonymous

Message:

Update fancyTxt()

Location:

trunk/lib

Files:

• Prefs.inc.php (modified) (3 diffs)
• Utilities.inc.php (modified) (1 diff)

trunk/lib/Prefs.inc.php

@@ -518 +518 @@
         // User_id must not be empty.
         if ('' == $this->getParam('user_id')) {
-            $app->logMsg(sprintf('Cannot save prefs because user_id not set.', null), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot load prefs because user_id not set.', null), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -591 +591 @@
         // Skip this method if not using the db.
         if ('database' != $this->getParam('storagetype')) {
-            $app->logMsg('Prefs->save() does nothing unless using a database storagetype.', LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg('Prefs->save() does nothing unless using a database storagetype.', LOG_DEBUG, __FILE__, __LINE__);
             return true;
         }
@@ -597 +597 @@
         // User_id must not be empty.
         if ('' == $this->getParam('user_id')) {
-            $app->logMsg(sprintf('Cannot save prefs because user_id not set.', null), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot save prefs because user_id not set.', null), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }

trunk/lib/Utilities.inc.php

@@ -221 +221 @@
  * @return string         Cleaned text.
  */
-function fancyTxt($text)
+function fancyTxt($text, $extra_search=null, $extra_replace=null)
 {
     $search = array();
     $replace = array();
 
-    // "double quoted text"  becomes  “double quoted text”
-    $search['double_quotes']    = '/(^|[^\w=])(?:"|"|"|"|“)([^"]+?)(?:"|"|"|"|”)([^\w]|$)/ms'; // " is the same as " and " and "
-    $replace['double_quotes']   = '$1“$2”$3';
-
-    // text's apostrophes  become  text’s apostrophes
-    $search['apostrophe']       = '/(\w)(?:\'|'|')(\w)/ms';
-    $replace['apostrophe']      = '$1’$2';
-
-    // 'single quoted text'  becomes  ‘single quoted text’
-    $search['single_quotes']    = '/(^|[^\w=])(?:\'|'|‘)([^\']+?)(?:\'|'|’)([^\w]|$)/ms';
-    $replace['single_quotes']   = '$1‘$2’$3';
-
-    // plural posessives' apostrophes become posessives’
-    $search['apostrophes']      = '/(s)(?:\'|'|')(\s)/ms';
-    $replace['apostrophes']     = '$1’$2';
-
-    // em--dashes  become em—dashes
-    $search['em_dash']          = '/(\s*[^!<-])--([^>-]\s*)/';
-    $replace['em_dash']         = '$1&mdash;$2';
-
-    return preg_replace($search, $replace, $text);
+    // "double quoted text"  →  “double quoted text”
+    $search['_double_quotes']    = '/(?<=^|[^\w=(])(?:"|&quot;|&#0?34;|&#x22;|&ldquo;)([\w\'.
(—–-][^"]*?)(?:"|&quot;|&#0?34;|&#x22;|&rdquo;)(?=[^)\w]|$)/imsu'; // " is the same as &quot; and &#34; and &#034; and &#x22;
+    $replace['_double_quotes']   = '“$1”';
+
+    // text's apostrophes  →  text’s apostrophes (except foot marks: 6'3")
+    $search['_apostrophe']       = '/(?<=[a-z])(?:\'|&#0?39;)(?=\w)/imsu';
+    $replace['_apostrophe']      = '’';
+
+    // 'single quoted text'  →  ‘single quoted text’
+    $search['_single_quotes']    = '/(?<=^|[^\w=(])(?:\'|&#0?39;|&lsquo;)([\w"][^\']+?)(?:\'|&#0?39;|&rsquo;)(?=[^)\w]|$)/imsu';
+    $replace['_single_quotes']   = '‘$1’';
+
+    // plural posessives' apostrophes  →  posessives’  (except foot marks: 6')
+    $search['_apostrophes']      = '/(?<=s)(?:\'|&#0?39;|&rsquo;)(?=\s)/imsu';
+    $replace['_apostrophes']     = '’';
+
+    // double--hyphens  →  en — dashes
+    $search['_em_dash']          = '/(?<=[\w\s"\'”’)])--(?=[\w\s“”‘"\'(?])/imsu';
+    $replace['_em_dash']         = ' – ';
+
+    // ...  →  

+    $search['_elipsis']          = '/(?<=^|[^.])\.\.\.(?=[^.]|$)/imsu';
+    $replace['_elipsis']         = '
';
+
+    if (is_array($extra_search) && is_array($extra_replace) && sizeof($extra_search) == sizeof($extra_replace)) {
+        // Append additional search replacements.
+        $search = array_merge($search, $extra_search);
+        $replace = array_merge($replace, $extra_replace);
+    }
+
+    return trim(preg_replace($search, $replace, $text));
 }