Merge pull request #478 from Neriderc/preferred-name

Add Preferred name abbreviation

app/Person.php

@@ -365,6 +365,16 @@ private function getAbbreviatedName(array $nameArray): string
                 return explode(" ", $nameArray["givn"])[0];
             case 40: /* Surname(s) */
                 return $nameArray["surn"];
+            case 80: /* Preferred given name and surname */
+                $pattern = '/<span class="starredname">(.*?)<\/span>/';
+                preg_match_all($pattern, $nameArray['full'], $matches);
+                $preferredName = $matches[1];
+                if (empty($preferredName)) {
+                    $preferredName = explode(" ", $nameArray["givn"])[0];
+                } else {
+                    $preferredName = implode(' ', $preferredName);
+                }
+                return $preferredName . ' ' . $nameArray['surname'];
             case 50: /* Initials only */
                 // Split by space or hyphen to get different names
                 $givenParts = preg_split('/[\s-]/', $nameArray["givn"]);

app/Settings.php

@@ -56,7 +56,7 @@ public function __construct(){
         $this->defaultSettings['url_xref_treatment_options']['nothing'] = "Don't add to list";
         $this->defaultSettings['url_xref_treatment_options']['overwrite'] = "Overwrite";
         $this->defaultSettings['use_abbr_places'] = [0 => "Full place name", 10 => "City and country" ,  20 => "City and 2 letter ISO country code", 30 => "City and 3 letter ISO country code"];
-        $this->defaultSettings['use_abbr_names'] = [0 => "Full name", 10 => "Given and surnames", 20 => "Given names" , 30 => "First given name only", 40 => "Surnames", 50 => "Initials only", 60 => "Given name initials and surname", 70 => "Don't show names"];
+        $this->defaultSettings['use_abbr_names'] = [0 => "Full name", 10 => "Given and surnames", 20 => "Given names" , 30 => "First given name only", 80 => "Preferred given name and surname", 40 => "Surnames", 50 => "Initials only", 60 => "Given name initials and surname", 70 => "Don't show names"];
         $this->defaultSettings['photo_shape_options'] = [Person::SHAPE_NONE => "No change", Person::SHAPE_OVAL => "Oval", Person::SHAPE_CIRCLE => "Circle" , Person::SHAPE_SQUARE => "Square", Person::SHAPE_ROUNDED_RECT => "Rounded rectangle", Person::SHAPE_ROUNDED_SQUARE => "Rounded square"];
         $this->defaultSettings['photo_quality_options'] = [0 => "Lowest", 20 => "Low", 50 => "Medium" , 75 => "High", 100 => "Highest"];
         $this->defaultSettings['indi_tile_shape_custom_options'] = [0 => "Rectangle", 10 => "Rounded rectangle"];