majour redesign of the Phrasebook UI to support recursive phrases

1 files changed, 493 insertions, 577 deletions

diff --git a/src/ui/android/assets/phrases.xml b/src/ui/android/assets/phrases.xml
index b02b21a6b..9e6c84601 100644
--- a/src/ui/android/assets/phrases.xml
+++ b/src/ui/android/assets/phrases.xml
@@ -2,669 +2,585 @@
 
 <phrasebook>
     <sentence desc="What is somebody's name?" id="QWhatName">
-        <node syntax="PQuestion">
-            <node syntax="QWhatName">
-                <option option="Who are we talking about?">
-                    <node child="allpersons" />
-                </option>
-            </node>
-        </node>
+        <function name="PQuestion">
+            <function name="QWhatName">
+                <call desc="Who are we talking about?" ref="allpersons"/>
+            </function>
+        </function>
     </sentence>
 
     <sentence desc="Somebody's name is..." id="AHasName">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node args="2" syntax="AHasName">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <node syntax="NameNN" />
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AHasName">
+                    <call ref="allpersons"/>
+                    <function name="NameNN"/>
+				</function>
+			</function>
+		</call>
     </sentence>
 
-    <!--works-->
     <sentence desc="How old is someone?" id="QWhatAge">
-        <node syntax="PQuestion">
-            <node syntax="QWhatAge">
-                <option option="Who are we talking about?">
-                    <node child="allpersons" />
-                </option>
-            </node>
-        </node>
+        <function name="PQuestion">
+            <function name="QWhatAge">
+                <call ref="allpersons"/>
+            </function>
+        </function>
     </sentence>
 
     <sentence desc="Someone's age is..." id="AHasAge">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node args="2" syntax="AHasAge">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons" />
-                    </option>
-                    <option option="How many years?">
-                        <node syntax="NNumeral" />
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AHasAge">
+                    <call ref="allpersons"/>
+                    <function name="NNumeral">
+						<numeral desc="How many years?"/>
+                    </function>
+                </function>
+            </function>
+        </call>
     </sentence>
 
-    <sentence advanced="true" desc="Someone loves someone" id="ALove">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node args="2" syntax="ALove">
-                    <option option="Who loves someone?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <option option="Who is loved?">
-                        <node child="allpersons"></node>
-                    </option>
-                </node>
-            </node>
-        </node>
+    <sentence desc="Someone loves someone" id="ALove">
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="ALove">
+                    <call desc="Who loves someone?" ref="allpersons"/>
+                    <call desc="Who is loved?" ref="allpersons"/>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence advanced="true" desc="Someone is married" id="AMarried">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node syntax="AMarried">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons" />
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AMarried">
+                    <call ref="allpersons"/>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone has children" id="AHasChildren">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node args="2" syntax="AHasChildren">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <option option="How many children?">
-                        <node syntax="NNumeral" />
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AHasChildren">
+                    <call ref="allpersons"/>
+                    <function name="NNumeral">
+						<numeral desc="How many children?"/>
+					</function>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone lives somewhere" id="ALive">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node args="2" syntax="ALive">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <option option="Living where?">
-                        <node child="country"></node>
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="ALive">
+                    <call ref="allpersons"/>
+                    <call desc="Living where?" ref="country"/>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone wants to go somewhere" id="AWantGo">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node args="2" syntax="AWantGo">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <option option="What article?">
-                        <node child="a/an/the">
-                            <option option="What place?">
-                                <node child="places"></node>
-                            </option>
-                        </node>
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AWantGo">
+                    <call ref="allpersons"/>
+                    <call ref="a/an/the">
+                        <call ref="places"/>
+                    </call>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone is somewhere" id="ABePlace">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node args="2" syntax="ABePlace">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <option option="What article?">
-                        <node child="a/an/the">
-                            <option option="What place?">
-                                <node child="places"></node>
-                            </option>
-                        </node>
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="ABePlace">
+                    <call ref="allpersons"/>
+                    <call ref="a/an/the">
+                        <call desc="What place?" ref="places"/>
+                    </call>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="How far is something?" id="HowFar">
-        <node syntax="PQuestion">
-            <node syntax="HowFar">
-                <option option="What place are we asking about?">
-                    <node child="superlative_places" />
-                </option>
-            </node>
-        </node>
+        <function name="PQuestion">
+            <function name="HowFar">
+                <call desc="What place are we asking about?" ref="superlative_places"/>
+            </function>
+        </function>
     </sentence>
 
     <sentence desc="How far is something from somewhere?" id="HowFarFrom">
-        <node syntax="PQuestion">
-            <node args="2" syntax="HowFarFrom">
-                <option option="Where are we going from?">
-                    <node child="superlative_places" />
-                </option>
-                <option option="Where are we going to?">
-                    <node child="superlative_places" />
-                </option>
-            </node>
-        </node>
+        <function name="PQuestion">
+            <function name="HowFarFrom">
+                <call desc="Where are we going from?" ref="superlative_places"/>
+                <call desc="Where are we going to?" ref="superlative_places"/>
+            </function>
+        </function>
     </sentence>
 
     <sentence desc="Some place is open" id="PropOpen">
-        <node child="phraseit">
-            <node syntax="PropOpen">
-                <node args="2" syntax=" ">
-                    <option option="Superlative">
-                        <node child="superlative" />
-                    </option>
-                    <option option="What place are we asking about?">
-                        <node child="places" />
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropOpen">
+                <call ref="superlative">
+                    <call ref="places"/>
+                </call>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Some place is closed" id="PropClosed">
-        <node child="phraseit">
-            <node syntax="PropClosed">
-                <node args="2" syntax=" ">
-                    <option option="Superlative">
-                        <node child="superlative" />
-                    </option>
-                    <option option="What place are we asking about?">
-                        <node child="places" />
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropClosed">
+                <call ref="superlative">
+                    <call ref="places"/>
+                </call>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone wants some food" id="AWant">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node args="2" syntax="AWant">
-                    <option option="Who wants food?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <node child="food_with_objectsPrep"></node>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AWant">
+                    <call desc="Who wants food?" ref="allpersons"/>
+                    <call ref="objectsPrep">
+                        <call ref="food"/>
+                    </call>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone likes some food" id="ALike">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node args="2" syntax="ALike">
-                    <option option="Who likes it?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <node child="det">
-                        <node child="food"></node>
-                    </node>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="ALike">
+                    <call desc="Who likes it?" ref="allpersons"/>
+                    <call ref="det">
+                        <call ref="food"/>
+                    </call>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone has a table" id="AHasTable">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node args="2" syntax="AHasTable">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <option option="How many persons?">
-                        <node syntax="NNumeral"/>
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AHasTable">
+                    <call ref="allpersons"/>
+                    <function name="NNumeral">
+						<numeral desc="How many persons?"/>
+                    </function>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone has a room" id="AHasRoom">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node args="2" syntax="AHasRoom">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <option option="How many persons?">
-                        <node syntax="NNumeral"/>
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AHasRoom">
+                    <call ref="allpersons"/>
+                    <function name="NNumeral">
+						<numeral desc="How many persons?"/>
+                    </function>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="How much does something cost?" id="HowMuchCost">
-        <node syntax="PQuestion">
-            <node syntax="HowMuchCost">
-                <node child="det">
-                    <node child="food" />
-                </node>
-            </node>
-        </node>
+        <function name="PQuestion">
+            <function name="HowMuchCost">
+                <call ref="det">
+                    <call ref="food"/>
+                </call>
+            </function>
+        </function>
     </sentence>
 
     <sentence desc="Something costs ..." id="ItCost">
-        <node child="phraseit">
-            <node args="2" syntax="ItCost">
-                <node child="det">
-					<node child="food"/>
-                </node>
-				<node args="2" syntax="AmountCurrency">
-					<option option="How much does it cost?">
-						<node syntax="NNumeral"/>
-					</option>
-					<option option="In what currency?">
-						<node child="currency" />
-					</option>
-				</node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="ItCost">
+                <call ref="det">
+					<call ref="food"/>
+                </call>
+				<function name="AmountCurrency">
+					<function name="NNumeral">
+						<numeral desc="How much does it cost?"/>
+					</function>
+					<call ref="currency"/>
+				</function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone is hungry" id="AHungry">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node syntax="AHungry">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons" />
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AHungry">
+                    <call ref="allpersons"/>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence advanced="true" desc="Someone is thirsty" id="AThirsty">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node syntax="AThirsty">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons" />
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AThirsty">
+                    <call ref="allpersons" />
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone is tired" id="ATired">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node syntax="ATired">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons" />
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="ATired">
+                    <call ref="allpersons" />
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone is scared" id="AScared">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node syntax="AScared">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AScared">
+                    <call ref="allpersons"/>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone is ill" id="AIll">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node syntax="AIll">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AIll">
+                    <call ref="allpersons"/>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone is ready" id="AReady">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node syntax="AReady">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AReady">
+                    <call ref="allpersons"/>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone speaks a language" id="ASpeak">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node args="2" syntax="ASpeak">
-                    <option option="Who speaks it?">
-                        <node child="allpersons"></node>
-                    </option>
-                    <option option="What language?">
-                        <node child="language" />
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="ASpeak">
+                    <call desc="Who speaks it?" ref="allpersons"/>
+                    <call ref="language"/>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone understands" id="AUnderstand">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node syntax="AUnderstand">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AUnderstand">
+                    <call ref="allpersons"/>
+                </function>
+            </function>
+        </call>
     </sentence>
 
     <sentence desc="Someone knows" id="AKnow">
-        <node child="phraseit">
-            <node syntax="PropAction">
-                <node syntax="AKnow">
-                    <option option="Who are we talking about?">
-                        <node child="allpersons"></node>
-                    </option>
-                </node>
-            </node>
-        </node>
+        <call ref="phraseit">
+            <function name="PropAction">
+                <function name="AKnow">
+                    <call ref="allpersons"/>
+                </function>
+            </function>
+        </call>
     </sentence>
 
-    <advanced desc="Reported Speech" id="AKnowQuestion">
-        <node child="advphraseit">
-            <node syntax="PropAction">
-                <node syntax="AKnow">
-                    <option option="Who is saying they know this?">
-                        <node child="allpersons" />
-                    </option>
-                </node>
-            </node>
-        </node>
-    </advanced>
-
     <!-- ___________________________________________________________________________________________ -->
     <!--Option lists -->
-    <child id="allpersons">
-        <node child="persons" />
-        <node child="familypersons" />
-    </child>
-
-    <child id="superlative_places">
-        <node child="superlative">
-            <option option="">
-                <node child="places"></node>
-            </option>
-        </node>
-    </child>
-
-    <child id="a/an/the">
-        <node desc="a/an" syntax="APlace">
-            <option option="">
-                <node syntax=" " />
-            </option>
-        </node>
-        <node desc="The" syntax=" ">
-            <option option=" ">
-                <node child="superlative" />
-            </option>
-        </node>
-    </child>
-
-    <child id="phraseit">
-        <option option="How to phrase it?">
-            <node desc="As a statement" syntax="PSentence">
-                <node syntax="SProp"/>
-            </node>
-            <node desc="As a question" syntax="PQuestion">
-                <node syntax="QProp"/>
-            </node>
-            <node desc="As a negation" syntax="PSentence">
-                <node syntax="SPropNot"/>
-            </node>
-        </option>
-    </child>
-
-    <child id="advphraseit">
-        <option option="How are they phrasing it?">
-            <node desc="As a statement" syntax="PSentence">
-                <node syntax="SProp"></node>
-            </node>
-            <node desc="As a question" syntax="PQuestion">
-                <node syntax="QProp"></node>
-            </node>
-            <node desc="As a negation" syntax="PSentence">
-                <node syntax="SPropNot"></node>
-            </node>
-        </option>
-    </child>
-
-    <child id="language">
-        <option option="What language?">
-            <node desc="Bulgarian" syntax="(LangNat Bulgarian)" />
-            <node desc="Catalan" syntax="(LangNat Catalan)" />
-            <node desc="Danish" syntax="(LangNat Danish)" />
-            <node desc="Dutch" syntax="(LangNat Dutch)" />
-            <node desc="English" syntax="(LangNat English)" />
-            <node desc="Finnish" syntax="(LangNat Finnish)" />
-            <node desc="Flemish" syntax="Flemish" />
-            <node desc="French" syntax="(LangNat French)" />
-            <node desc="German" syntax="(LangNat German)" />
-            <node desc="Italian" syntax="(LangNat Italian)" />
-            <node desc="Norwegian" syntax="(LangNat Norwegian)" />
-            <node desc="Polish" syntax="(LangNat Polish)" />
-            <node desc="Romanian" syntax="(LangNat Romanian)" />
-            <node desc="Russian" syntax="(LangNat Russian)" />
-            <node desc="Spanish" syntax="(LangNat Spanish)" />
-            <node desc="Swedish" syntax="(LangNat Swedish)" />
-        </option>
-    </child>
-
-    <child id="nationality">
-        <option option="What nationality">
-            <node desc="Belgian" syntax="Belgian"></node>
-            <node desc="Bulgarian" syntax="CitiNat Bulgarian"></node>
-            <node desc="Catalan" syntax="CitiNat Catalan"></node>
-            <node desc="Dutch" syntax="CitiNat Dutch"></node>
-            <node desc="Danish" syntax="CitiNat Danish"></node>
-            <node desc="English" syntax="CitiNat English"></node>
-            <node desc="Finnish" syntax="CitiNat Finnish"></node>
-            <node desc="French" syntax="CitiNat French"></node>
-            <node desc="German" syntax="CitiNat German"></node>
-            <node desc="Italian" syntax="CitiNat Italian"></node>
-            <node desc="Norwegian" syntax="CitiNat Norwegian"></node>
-            <node desc="Polish" syntax="CitiNat Polish"></node>
-            <node desc="Romanian" syntax="CitiNat Romanian"></node>
-            <node desc="Russian" syntax="CitiNat Russian"></node>
-            <node desc="Spanish" syntax="CitiNat Spanish"></node>
-            <node desc="Swedish" syntax="CitiNat Swedish"></node>
-        </option>
-    </child>
-
-    <child id="places">
-        <node desc="supermarket" syntax="Supermarket"></node>
-        <node desc="bank" syntax="Bank"></node>
-        <node desc="amusement park" syntax="AmusementPark"></node>
-        <node desc="bar" syntax="Bar"></node>
-        <node desc="Cafeteria" syntax="Cafeteria"></node>
-        <node desc="car park" syntax="Parking"></node>
-        <node desc="center" syntax="Center"></node>
-        <node desc="cinema" syntax="Cinema"></node>
-        <node desc="church" syntax="Church"></node>
-        <node desc="disco" syntax="Disco"></node>
-        <node desc="hospital" syntax="Hospital"></node>
-        <node desc="hotel" syntax="Hotel"></node>
-        <node desc="museum" syntax="Museum"></node>
-        <node desc="park" syntax="Park"></node>
-        <node desc="pharmacy" syntax="Pharmacy"></node>
-        <node desc="post office" syntax="PostOffice"></node>
-        <node desc="pub" syntax="Pub"></node>
-        <!--<node desc="restaurant" syntax="CitRestaurant">
-            <node child="nationality"></node>
-        </node>-->
-        <node desc="school" syntax="School"></node>
-        <node desc="shop" syntax="Shop"></node>
-    </child>
-
-    <child id="superlative">
-        <node desc="(no superlative)" syntax="ThePlace"></node>
-        <node desc="best" syntax="SuperlPlace TheBest"></node>
-        <node desc="worst" syntax="SuperlPlace TheWorst"></node>
-        <node desc="nearest" syntax="SuperlPlace TheClosest"></node>
-        <node desc="cheapest" syntax="SuperlPlace TheCheapest"></node>
-        <node desc="most expensive" syntax="SuperlPlace TheMostExpensive"></node>
-        <node desc="most popular" syntax="SuperlPlace TheMostPopular"></node>
-    </child>
-
-    <child id="persons">
-        <node desc="me (male)" syntax="IMale" />
-        <node desc="me (female)" syntax="IFemale" />
-        <node desc="you (a male friend)" syntax="YouFamMale" />
-        <node desc="you (a female friend)" syntax="YouFamFemale" />
-        <node desc="you (a male stranger)" syntax="YouPolMale" />
-        <node desc="you (a female stranger)" syntax="YouPolFemale" />
-    </child>
-
-    <child id="familypersons">
-        <node desc="Wife of..." syntax="Wife">
-            <option option="">
-                <node child="persons" />
-            </option>
-        </node>
-        <node desc="Husband of..." syntax="Husband">
-            <option option="">
-                <node child="persons" />
-            </option>
-        </node>
-        <node desc="Daughter of..." syntax="Daughter">
-            <option option="">
-                <node child="persons" />
-            </option>
-        </node>
-        <node desc="Son of..." syntax="Son">
-            <option option="">
-                <node child="persons" />
-            </option>
-        </node>
-        <node desc="Children of..." syntax="Children">
-            <option option="">
-                <node child="persons" />
-            </option>
-        </node>
-    </child>
-
-    <child id="country">
-        <option option="What nationality">
-            <node desc="Belgium" syntax="Belgium"></node>
-            <node desc="Bulgaria" syntax="CountryNat Bulgarian"></node>
-            <node desc="Catalonia" syntax="CountryNat Catalan"></node>
-            <node desc="The Netherlands" syntax="CountryNat Dutch"></node>
-            <node desc="Denmark" syntax="CountryNat Danish"></node>
-            <node desc="England" syntax="CountryNat English"></node>
-            <node desc="Finland" syntax="CountryNat Finnish"></node>
-            <node desc="France" syntax="CountryNat French"></node>
-            <node desc="Germany" syntax="CountryNat German"></node>
-            <node desc="Italy" syntax="CountryNat Italian"></node>
-            <node desc="Norway" syntax="CountryNat Norwegian"></node>
-            <node desc="Poland" syntax="CountryNat Polish"></node>
-            <node desc="Romania" syntax="CountryNat Romanian"></node>
-            <node desc="Russia" syntax="CountryNat Russian"></node>
-            <node desc="Spain" syntax="CountryNat Spanish"></node>
-            <node desc="Sweden" syntax="CountryNat Swedish"></node>
-        </option>
-    </child>
-
-    <child id="food_with_objectsPrep">
-        <option option="What is being wanted?">
-            <node child="objectsPrep">
-                <node child="food"></node>
-            </node>
-        </option>
-    </child>
-
-    <child id="objectsPrep">
-        <node desc="a/an" syntax="OneObj">
-            <node syntax="ObjMass"></node>
-        </node>
-        <node desc="the" syntax="OneObj">
-            <node syntax="ObjItem">
-                <node syntax="TheMass"></node>
-            </node>
-        </node>
-        <node desc="this" syntax="OneObj">
-            <node syntax="ObjItem">
-                <node syntax="ThisMass"></node>
-            </node>
-        </node>
-        <node desc="that" syntax="OneObj">
-            <node syntax="ObjItem">
-                <node syntax="ThatMass"></node>
-            </node>
-        </node>
-    </child>
-
-    <child id="det">
-        <option option="Determiner">
-            <node desc="The" syntax="TheMass" />
-            <node desc="This" syntax="ThisMass" />
-            <node desc="That" syntax="ThatMass" />
-        </option>
-    </child>
-
-    <child id="food">
-        <option option="What are we talking about?">
-            <node desc="Beer" syntax="MassDrink Beer"></node>
-            <node desc="Bread" syntax="Bread"></node>
-            <node desc="Cheese" syntax="Cheese"></node>
-            <node desc="Chicken" syntax="Chicken"></node>
-            <node desc="Coffee" syntax="MassDrink Coffee"></node>
-            <node desc="Fish" syntax="Fish"></node>
-            <node desc="Meat" syntax="Meat"></node>
-            <node desc="Milk" syntax="Milk"></node>
-            <node desc="Salt" syntax="Salt"></node>
-            <node desc="Tea" syntax="MassDrink Tea"></node>
-            <node desc="Water" syntax="MassDrink Water"></node>
-            <node desc="Wine" syntax="MassDrink Wine"></node>
-        </option>
-    </child>
-    
-    <child id="currency">
-        <node desc="Euro"  syntax="Euro"/>
-        <node desc="Dollar" syntax="Dollar"/>
-        <node desc="DanishCrown" syntax="DanishCrown"/>
-        <node desc="NorwegianCrown" syntax="NorwegianCrown"/>
-        <node desc="SwedishCrown" syntax="SwedishCrown"/>
-        <node desc="Pound" syntax="Pound"/>
-        <node desc="Rouble" syntax="Rouble"/>
-        <node desc="Rupee" syntax="Rupee"/>
-        <node desc="Lei" syntax="Lei"/>
-        <node desc="Leva" syntax="Leva"/>
-        <node desc="Yuan" syntax="Yuan"/>
-        <node desc="Zloty" syntax="Zloty"/>
-    </child>
+    <option desc="Who are we talking about?" id="allpersons">
+        <function desc="me (male)" name="IMale" />
+        <function desc="me (female)" name="IFemale" />
+        <function desc="you (a male friend)" name="YouFamMale" />
+        <function desc="you (a female friend)" name="YouFamFemale" />
+        <function desc="you (a male stranger)" name="YouPolMale" />
+        <function desc="you (a female stranger)" name="YouPolFemale" />
+        <function desc="Wife of ..." name="Wife">
+            <call ref="allpersons"/>
+        </function>
+        <function desc="Husband of ..." name="Husband">
+            <call ref="allpersons"/>
+        </function>
+        <function desc="Daughter of ..." name="Daughter">
+            <call ref="allpersons"/>
+        </function>
+        <function desc="Son of ..." name="Son">
+            <call ref="allpersons"/>
+        </function>
+        <function desc="Children of ..." name="Children">
+            <call ref="allpersons"/>
+        </function>
+    </option>
+
+    <call id="superlative_places" ref="superlative">
+        <call ref="places"/>
+    </call>
+
+    <option desc="What article?" id="a/an/the">
+        <function desc="a/an" name="APlace">
+            <argument/>
+        </function>
+        <function desc="The" name="ThePlace">
+            <argument/>
+        </function>
+    </option>
+
+    <option desc="How to phrase it?" id="phraseit">
+        <function desc="As a statement" name="PSentence">
+            <function name="SProp">
+                <argument/>
+            </function>
+        </function>
+        <function desc="As a question" name="PQuestion">
+            <function name="QProp">
+		        <argument/>
+            </function>
+        </function>
+        <function desc="As a negation" name="PSentence">
+            <function name="SPropNot">
+                <argument/>
+            </function>
+        </function>
+    </option>
+
+    <option id="advphraseit" option="How are they phrasing it?">
+        <function desc="As a statement" name="PSentence">
+            <function name="SProp">
+			    <argument/>
+		    </function>
+        </function>
+        <function desc="As a question" name="PQuestion">
+            <function name="QProp">
+		    	<argument/>
+			</function>
+        </function>
+        <function desc="As a negation" name="PSentence">
+            <function name="SPropNot">
+		    	<argument/>
+			</function>
+        </function>
+    </option>
+
+    <option id="language" desc="What language?">
+        <function desc="Bulgarian" name="(LangNat Bulgarian)"/>
+        <function desc="Catalan" name="(LangNat Catalan)"/>
+        <function desc="Danish" name="(LangNat Danish)"/>
+        <function desc="Dutch" name="(LangNat Dutch)"/>
+        <function desc="English" name="(LangNat English)"/>
+        <function desc="Finnish" name="(LangNat Finnish)"/>
+        <function desc="Flemish" name="Flemish"/>
+        <function desc="French" name="(LangNat French)"/>
+        <function desc="German" name="(LangNat German)"/>
+        <function desc="Italian" name="(LangNat Italian)"/>
+        <function desc="Norwegian" name="(LangNat Norwegian)"/>
+        <function desc="Polish" name="(LangNat Polish)"/>
+        <function desc="Romanian" name="(LangNat Romanian)"/>
+        <function desc="Russian" name="(LangNat Russian)"/>
+        <function desc="Spanish" name="(LangNat Spanish)"/>
+        <function desc="Swedish" name="(LangNat Swedish)"/>
+    </option>
+
+    <option id="nationality" desc="What nationality">
+        <function desc="Belgian" name="Belgian"/>
+        <function desc="Bulgarian" name="CitiNat Bulgarian"/>
+        <function desc="Catalan" name="CitiNat Catalan"/>
+        <function desc="Dutch" name="CitiNat Dutch"/>
+        <function desc="Danish" name="CitiNat Danish"/>
+        <function desc="English" name="CitiNat English"/>
+        <function desc="Finnish" name="CitiNat Finnish"/>
+        <function desc="French" name="CitiNat French"/>
+        <function desc="German" name="CitiNat German"/>
+        <function desc="Italian" name="CitiNat Italian"/>
+        <function desc="Norwegian" name="CitiNat Norwegian"/>
+        <function desc="Polish" name="CitiNat Polish"/>
+        <function desc="Romanian" name="CitiNat Romanian"/>
+        <function desc="Russian" name="CitiNat Russian"/>
+        <function desc="Spanish" name="CitiNat Spanish"/>
+        <function desc="Swedish" name="CitiNat Swedish"/>
+    </option>
+
+    <option desc="What place are we asking about?" id="places">
+        <function desc="airport" name="AmusementPark"/>
+        <function desc="amusement park" name="AmusementPark"/>
+        <function desc="bank" name="Bank"/>
+        <function desc="bar" name="Bar"/>
+        <function desc="cafeteria" name="Cafeteria"/>
+        <function desc="center" name="Center"/>
+        <function desc="church" name="Church"/>
+        <function desc="cinema" name="Cinema"/>
+        <function desc="car park" name="Parking"/>
+        <function desc="disco" name="Disco"/>
+        <function desc="hospital" name="Hospital"/>
+        <function desc="hotel" name="Hotel"/>
+        <function desc="museum" name="Museum"/>
+        <function desc="park" name="Park"/>
+        <function desc="pharmacy" name="Pharmacy"/>
+        <function desc="post office" name="PostOffice"/>
+        <function desc="pub" name="Pub"/>
+        <function desc="restaurant" name="Restaurant"/>
+        <function desc="restaurant (National)" name="CitRestaurant">
+            <call ref="nationality"/>
+        </function>
+        <function desc="school" name="School"/>
+        <function desc="shop" name="Shop"/>
+        <function desc="station" name="Station"/>
+        <function desc="supermarket" name="Supermarket"/>
+        <function desc="theatre" name="Theatre"/>
+        <function desc="toilet" name="Toilet"/>
+        <function desc="university" name="University"/>
+        <function desc="zoo" name="Zoo"/>
+    </option>
+
+    <option id="superlative">
+        <function desc="(no superlative)" name="ThePlace">
+			<argument/>
+		</function>
+        <function desc="best" name="SuperlPlace">
+			<function name="TheBest"/>
+			<argument/>
+        </function>
+        <function desc="worst" name="SuperlPlace">
+			<function name="TheWorst"/>
+			<argument/>
+        </function>
+        <function desc="nearest" name="SuperlPlace">
+			<function name="TheClosest"/>
+			<argument/>
+        </function>
+        <function desc="cheapest" name="SuperlPlace">
+			<function name="TheCheapest"/>
+			<argument/>
+        </function>
+        <function desc="most expensive" name="SuperlPlace">
+			<function name="TheMostExpensive"/>
+			<argument/>
+        </function>
+        <function desc="most popular" name="SuperlPlace">
+			<function name="TheMostPopular"/>
+			<argument/>
+        </function>
+    </option>
+
+    <option id="country" desc="What nationality">
+        <function desc="Belgium" name="Belgium"/>
+        <function desc="Bulgaria" name="(CountryNat Bulgarian)"/>
+        <function desc="Catalonia" name="(CountryNat Catalan)"/>
+        <function desc="The Netherlands" name="(CountryNat Dutch)"/>
+        <function desc="Denmark" name="(CountryNat Danish)"/>
+        <function desc="England" name="(CountryNat English)"/>
+        <function desc="Finland" name="(CountryNat Finnish)"/>
+        <function desc="France" name="(CountryNat French)"/>
+        <function desc="Germany" name="(CountryNat German)"/>
+        <function desc="Italy" name="(CountryNat Italian)"/>
+        <function desc="Norway" name="(CountryNat Norwegian)"/>
+        <function desc="Poland" name="(CountryNat Polish)"/>
+        <function desc="Romania" name="(CountryNat Romanian)"/>
+        <function desc="Russia" name="(CountryNat Russian)"/>
+        <function desc="Spain" name="(CountryNat Spanish)"/>
+        <function desc="Sweden" name="(CountryNat Swedish)"/>
+    </option>
+
+    <option desc="What is being wanted?" id="objectsPrep">
+        <function desc="a/an" name="OneObj">
+            <function name="ObjMass">
+				<argument/>
+			</function>
+        </function>
+        <function desc="the" name="OneObj">
+            <function name="ObjItem">
+                <function name="TheMass">
+					<argument/>
+			    </function>
+            </function>
+        </function>
+        <function desc="this" name="OneObj">
+            <function name="ObjItem">
+                <function name="ThisMass">
+					<argument/>
+			    </function>
+            </function>
+        </function>
+        <function desc="that" name="OneObj">
+            <function name="ObjItem">
+                <function name="ThatMass">
+					<argument/>
+			    </function>
+            </function>
+        </function>
+    </option>
+
+    <option id="det" desc="Determiner">
+        <function desc="The"  name="TheMass">
+			<argument/>
+		</function>
+        <function desc="This" name="ThisMass">
+			<argument/>
+		</function>
+        <function desc="That" name="ThatMass">
+			<argument/>
+		</function>
+    </option>
+
+    <option id="food" desc="What are we talking about?">
+        <function desc="Beer" name="(MassDrink Beer)"/>
+        <function desc="Bread" name="Bread"/>
+        <function desc="Cheese" name="Cheese"/>
+        <function desc="Chicken" name="Chicken"/>
+        <function desc="Coffee" name="(MassDrink Coffee)"/>
+        <function desc="Fish" name="Fish"/>
+        <function desc="Meat" name="Meat"/>
+        <function desc="Milk" name="Milk"/>
+        <function desc="Salt" name="Salt"/>
+        <function desc="Tea" name="(MassDrink Tea)"/>
+        <function desc="Water" name="(MassDrink Water)"/>
+        <function desc="Wine" name="(MassDrink Wine)"/>
+    </option>
+
+    <option id="currency">
+        <function desc="Euro"  name="Euro"/>
+        <function desc="Dollar" name="Dollar"/>
+        <function desc="DanishCrown" name="DanishCrown"/>
+        <function desc="NorwegianCrown" name="NorwegianCrown"/>
+        <function desc="SwedishCrown" name="SwedishCrown"/>
+        <function desc="Pound" name="Pound"/>
+        <function desc="Rouble" name="Rouble"/>
+        <function desc="Rupee" name="Rupee"/>
+        <function desc="Lei" name="Lei"/>
+        <function desc="Leva" name="Leva"/>
+        <function desc="Yuan" name="Yuan"/>
+        <function desc="Zloty" name="Zloty"/>
+    </option>
 </phrasebook>