Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-master

sanityCheck

@@ -57,6 +57,8 @@ $GREP "\$PC.refreshmentType[^ =]" -- 'src/*' | myprint "ShouldBeRefreshment"
 $GREP "<</[a-zA-Z]*[^a-zA-Z<>]\+[a-zA-Z]*>>" -- 'src/*' | myprint "DoubleSlash"
 # Check, e.g.  <<else $foo==4
 $GREP "<<else >\?[^>]" -- 'src/*' | myprint "ShouldBeElseIf"
+# Check, e.g.  <</else>>
+$GREP "<<[/]else" -- 'src/*' | myprint "Extra slash"
 # Check, e.g., =to
 $GREP "=to" -- 'src/*' | myprint "EqualAndTo"
 # Check doing  $slaves.foo instead of $slaves[i].foo
@@ -67,11 +69,14 @@ $GREP -e "activeSlave[.]" --and -e "slaves\[..\?\][.]" --and --not -e '[.]ID' --
 $GREP "<<set[^{>=]*==" -- 'src/*' | myprint "DoubleEqualsInSet"
 # Check for, e.g   <<if slaves[foo]>>
 $GREP "<<\([^>]\|[^>]>[^>]\)*[^$]slaves\[" -- 'src/*' | myprint "MissingDollar"
+# Check for duplicate words, e.g. with with
+$GREP -e  " \(\b[a-zA-Z][a-zA-Z]\+\) \1\b " --and --not -e "her her" --and --not -e "you you" --and --not -e "that that" -- 'src/*' | myprint "Duplicate words"
 
 # Check that we do not have any variables that we use only once.   e.g.     $onlyUsedOnce
+# Ignore  *Nationalities
 (
 cd src/
-cat $(find . -name "*.tw" ) | tr -c '$a-zA-Z' '\n'  | sed -n '/^[$]/p' | sort | uniq -c | grep ' 1 ' | sed 's/^ *1 [$]/-e[$]/' | sed 's/$/\\\\W/' | xargs -r  git grep -n --color | myprint "OnlyUsedOnce"
+cat $(find . -name "*.tw" ) | tr -c '$a-zA-Z' '\n'  | sed -n '/^[$]/p' | grep -v "Nationalities" | sort | uniq -c | grep ' 1 ' | sed 's/^ *1 [$]/-e[$]/' | sed 's/$/\\\\W/' | xargs -r  git grep -n --color | myprint "OnlyUsedOnce"
 )
 
 

src/gui/css/familyTree.tw

@@ -60,7 +60,8 @@
     font-weight: bold;
     margin: 0;
     background: #ffffff88;
-	border: 2px solid Gold; 
+    border: 2px solid Gold; 
+    white-space: nowrap;
 }
 
 #editFamily {

src/utility/miscWidgets.tw

@@ -1358,6 +1358,15 @@
 <<widget "Enunciate">>
 	<<if SlaveStatsChecker.checkForLisp($args[0])>>
 		<<if def $PC.customTitleLisp>><<set $titleEnunciate = $PC.customTitleLisp>><<elseif $PC.title != 0>><<set $titleEnunciate = "Mathter">><<else>><<set $titleEnunciate = "Mithtreth">><</if>>
+		<<if $args[0].father == -1>>
+                        <<set $titleEnunciate = "Dadda">>
+                <<elseif $args[0].mother == -1>>
+                        <<set $titleEnunciate = "Mumma">>
+                <<elseif $args[0].mother == $PC.mother || $args[0].father == $PC.father>>
+                        <<set $titleEnunciate = "Brova">>
+                <<elseif $PC.mother == $args[0].ID || $PC.father == $args[0].ID>>
+                        <<set $titleEnunciate = "Son">>
+                <</if>>
 		<<set $sayEnunciate = "lisp">>
 		<<set $sEnunciate = "th">>
 		<<set $SEnunciate = "Th">>
@@ -1365,6 +1374,16 @@
 		<<set $cEnunciate = "th">>
 	<<else>>
 		<<if def $PC.customTitle>><<set $titleEnunciate = $PC.customTitle>><<elseif $PC.title != 0>><<set $titleEnunciate = "Master">><<else>><<set $titleEnunciate = "Mistress">><</if>>
+                <<if $args[0].father == -1>>
+                        <<set $titleEnunciate = "Daddy">>
+                <<elseif $args[0].mother == -1>>
+                        <<set $titleEnunciate = "Mummy">>
+                <<elseif $args[0].mother == $PC.mother || $args[0].father == $PC.father>>
+                        <<set $titleEnunciate = "Brother">>
+                <<elseif $PC.mother == $args[0].ID || $PC.father == $args[0].ID>>
+                        <<set $titleEnunciate = "Son">>
+                <</if>>
+
 		<<set $sayEnunciate = "say">>
 		<<set $sEnunciate = "s">>
 		<<set $SEnunciate = "S">>