diff --git a/lib/doc/MkExxTable.hs b/lib/doc/MkExxTable.hs index 934b7cdef..e8d013fb3 100644 --- a/lib/doc/MkExxTable.hs +++ b/lib/doc/MkExxTable.hs @@ -74,7 +74,7 @@ mkEx = unwords . bind . mkE . words where mkE e = case e of "atomic":"term":_ -> ["*"] "[]":_ -> ["''"] - "pre":p@('{':_):es -> init (init (drop 2 p)) : mkE es + "pre":p@('{':_):es -> init (init (drop 2 p)) : [] ---- mkE es -- occurs only on last position e0:es -> e0:mkE es _ -> e diff --git a/lib/doc/api-examples.txt b/lib/doc/api-examples.txt index 3ab5c7f94..d16e7bdc4 100644 --- a/lib/doc/api-examples.txt +++ b/lib/doc/api-examples.txt @@ -328,31 +328,31 @@ mkDet i_Pron mkDet : Pron -> Num -> Det -- my five mkDet i_Pron (mkNum (mkNumeral n5_Unit)) the_Det : Det -- the (house) -mkNP the_Det house_N +mkUtt (mkNP the_Det house_N) a_Det : Det -- a (house) -mkNP a_Det house_N +mkUtt (mkNP a_Det house_N) theSg_Det : Det -- the (houses) -mkNP theSg_Det house_N +mkUtt (mkNP theSg_Det house_N) thePl_Det : Det -- the (houses) -mkNP thePl_Det house_N +mkUtt (mkNP thePl_Det house_N) aSg_Det : Det -- a (house) -mkNP aSg_Det woman_N +mkUtt (mkNP aSg_Det woman_N) aPl_Det : Det -- (houses) -mkNP aPl_Det woman_N +mkUtt (mkNP aPl_Det woman_N) this_Det : Det -mkNP this_Det woman_N +mkUtt (mkNP this_Det woman_N) that_Det : Det -mkNP that_Det woman_N +mkUtt (mkNP that_Det woman_N) these_Det : Det -mkNP these_Det woman_N +mkUtt (mkNP these_Det woman_N) those_Det : Det -mkNP those_Det woman_N +mkUtt (mkNP those_Det woman_N) mkQuant : Pron -> Quant -- my -mkNP (mkQuant i_Pron) house_N +mkUtt (mkNP (mkQuant i_Pron) house_N) the_Quant : Quant -- the -mkNP the_Quant house_N +mkUtt (mkNP the_Quant house_N) a_Quant : Quant -- a -mkNP a_Quant house_N +mkUtt (mkNP a_Quant house_N) -- mkNum : Str -> Num -- thirty-five (given by "35") mkNum : Numeral -> Num -- twenty mkNum (mkNumeral (tenfoldSub100 n2_Unit)) @@ -692,7 +692,7 @@ mkQCl who_IP (mkClSlash she_NP (mkVPSlash send_V3 it_NP)) mkVPSlash : V2A -> AP -> VPSlash -- (whom) (she) paints red mkQCl who_IP (mkClSlash she_NP (mkVPSlash paint_V2A (mkAP red_A))) mkVPSlash : V2Q -> QS -> VPSlash -- (whom) (she) asks who sleeps -mkQCl who_IP (mkClSlash she_NP (mkVPSlash ask_V2Q (mkQS (mkQCl where_Idv (mkCl i_NP sleep_V))))) +mkQCl who_IP (mkClSlash she_NP (mkVPSlash ask_V2Q (mkQS (mkQCl where_IAdv (mkCl i_NP sleep_V))))) mkVPSlash : V2S -> S -> VPSlash -- (whom) (she) tells that we sleep mkQCl who_IP (mkClSlash she_NP (mkVPSlash answer_V2S (mkS (mkCl i_NP sleep_V)))) mkVPSlash : V2V -> VP -> VPSlash -- (whom) (she) forces to sleep @@ -710,7 +710,7 @@ mkNP all_Predet (mkNP thePl_Det man_N) almost_AdA : AdA mkAP almost_AdA red_A almost_AdN : AdN -mkCard almostAdN (mkCard (mkNumeral n8_Unit)) +mkCard almost_AdN (mkCard (mkNumeral n8_Unit)) although_Subj : Subj mkAdv although_Subj (mkS (mkCl she_NP sleep_V)) always_AdV : AdV @@ -744,9 +744,9 @@ mkAdv either7or_DConj here_Adv there_Adv every_Det : Det every_Det everybody_NP : NP -- everybody -everybody_NP +mkUtt everybody_NP everything_NP : NP -everything_NP +mkUtt everything_NP everywhere_Adv : Adv everywhere_Adv few_Det : Det @@ -756,7 +756,7 @@ mkAdv for_Prep it_NP from_Prep : Prep mkAdv from_Prep it_NP he_Pron : Pron -he_Pron +mkUtt (mkNP he_Pron) here_Adv : Adv here_Adv here7to_Adv : Adv -- to here @@ -770,7 +770,7 @@ mkUtt (mkIP how8many_IDet house_N) how8much_IAdv : IAdv mkUtt how8much_IAdv i_Pron : Pron -i_Pron +mkUtt (mkNP i_Pron) if_Subj : Subj mkAdv if_Subj (mkS (mkCl she_NP sleep_V)) in8front_Prep : Prep -- in front of @@ -778,7 +778,7 @@ mkAdv in8front_Prep it_NP in_Prep : Prep mkAdv in_Prep it_NP it_Pron : Pron -it_Pron +mkUtt (mkNP it_Pron) less_CAdv : CAdv less_CAdv many_Det : Det @@ -810,7 +810,7 @@ mkAdv possess_Prep it_NP quite_Adv : AdA quite_Adv she_Pron : Pron -she_Pron +mkUtt (mkNP she_Pron) so_AdA : AdA so_AdA someSg_Det : Det @@ -818,9 +818,9 @@ someSg_Det somePl_Det : Det somePl_Det somebody_NP : NP -somebody_NP +mkUtt somebody_NP something_NP : NP -something_NP +mkUtt something_NP somewhere_Adv : Adv somewhere_Adv that_Quant : Quant @@ -836,7 +836,7 @@ there7from_Adv therefore_PConj : PConj therefore_PConj they_Pron : Pron -they_Pron +mkUtt (mkNP they_Pron) this_Quant : Quant mkNP this_Quant house_N through_Prep : Prep @@ -852,7 +852,7 @@ very_AdA want_VV : VV want_VV we_Pron : Pron -we_Pron +mkUtt (mkNP we_Pron) whatPl_IP : IP -- what (plural) whatPl_IP whatSg_IP : IP -- what (singular) @@ -878,15 +878,15 @@ mkAdv without_Prep it_NP yes_Utt : Utt yes_Utt youSg_Pron : Pron -- you (singular) -youSg_Pron +mkUtt (mkNP youSg_Pron) youPl_Pron : Pron -- you (plural) -youPl_Pron +mkUtt (mkNP youPl_Pron) youPol_Pron : Pron -- you (polite) -youPol_Pron +mkUtt (mkNP youPol_Pron) no_Quant : Quant -mkNP no_Quant house_N +mkUtt (mkNP no_Quant house_N) not_Predet : Predet -mkNP not_Predet everybody_NP +mkUtt (mkNP not_Predet everybody_NP) if_then_Conj : Conj mkAdv if_then_Conj here_Adv there_Adv at_least_AdN : AdN @@ -894,9 +894,9 @@ mkCard at_least_AdN (mkCard (mkNumeral n8_Unit)) at_most_AdN : AdN mkCard at_most_AdN (mkCard (mkNumeral n8_Unit)) nobody_NP : NP -nobody_NP +mkUtt nobody_NP nothing_NP : NP -nothing_NP +mkUtt nothing_NP except_Prep : Prep mkAdv except_Prep it_NP as_CAdv : CAdv diff --git a/lib/doc/synopsis.html b/lib/doc/synopsis.html index 8e3c8eda1..9c564ab18 100644 --- a/lib/doc/synopsis.html +++ b/lib/doc/synopsis.html @@ -651,7 +651,7 @@ Lexical category, constructors given in almost_AdN AdN -
atomic term almostAdN
+
almost eight
at_least_AdN @@ -666,7 +666,7 @@ Lexical category, constructors given in mkAdN CAdv -> AdN -
more than eight
+
more than eight
@@ -1003,7 +1003,7 @@ Lexical category, constructors given in mkCl NP -> VQ -> QS -> Cl -
she wonders who sleeps
+
she wonders who sleeps
mkCl @@ -1242,17 +1242,17 @@ Lexical category, constructors given in aPl_Det Det -
women
+
women
aSg_Det Det -
a woman
+
a woman
a_Det Det -
a house
+
a house
every_Det @@ -1262,7 +1262,7 @@ Lexical category, constructors given in few_Det Det -
few
+
few
many_Det @@ -1272,7 +1272,7 @@ Lexical category, constructors given in mkDet Quant -> Det -
this
+
this
mkDet @@ -1322,7 +1322,7 @@ Lexical category, constructors given in much_Det Det -
much
+
much
somePl_Det @@ -1337,37 +1337,37 @@ Lexical category, constructors given in that_Det Det -
that woman
+
that woman
thePl_Det Det -
the houses
+
the houses
theSg_Det Det -
the house
+
the house
the_Det Det -
the house
+
the house
these_Det Det -
these women
+
these women
this_Det Det -
this woman
+
this woman
those_Det Det -
those women
+
those women
@@ -1480,7 +1480,7 @@ Lexical category, constructors given in mkIAdv Prep -> IP -> IAdv -
in which city
+
in which city
mkIAdv @@ -1537,7 +1537,7 @@ Lexical category, constructors given in how8many_IDet IDet -
how many houses
+
how many houses
mkIDet @@ -1608,17 +1608,17 @@ Lexical category, constructors given in whatPl_IP IP -
what
+
what
whatSg_IP IP -
what
+
what
what_IP IP -
what
+
what
whoPl_IP @@ -1665,7 +1665,7 @@ Lexical category, constructors given in mkImp VP -> Imp -
come to my house
+
come to my house
mkImp @@ -1675,7 +1675,7 @@ Lexical category, constructors given in mkImp V2 -> NP -> Imp -
buy it
+
buy it
@@ -1854,12 +1854,12 @@ Lexical category, constructors given in everybody_NP NP -
everybody
+
everybody
everything_NP NP -
everything
+
everything
he_NP @@ -1974,12 +1974,12 @@ Lexical category, constructors given in mkNP CN -> NP -
old beer
+
old beer
mkNP N -> NP -
beer
+
beer
mkNP @@ -2014,12 +2014,12 @@ Lexical category, constructors given in nobody_NP NP -
nobody
+
nobody
nothing_NP NP -
nothing
+
nothing
she_NP @@ -2029,12 +2029,12 @@ Lexical category, constructors given in somebody_NP NP -
somebody
+
somebody
something_NP NP -
something
+
something
that_NP @@ -2324,7 +2324,7 @@ Lexical category, constructors given in not_Predet Predet -
not everybody
+
not everybody
only_Predet @@ -2461,47 +2461,47 @@ Lexical category, constructors given in he_Pron Pron -
he
+
he
i_Pron Pron -
I
+
I
it_Pron Pron -
it
+
it
she_Pron Pron -
she
+
she
they_Pron Pron -
they
+
they
we_Pron Pron -
we
+
we
youPl_Pron Pron -
you
+
you
youPol_Pron Pron -
you
+
you
youSg_Pron Pron -
you
+
you
@@ -2578,7 +2578,7 @@ Lexical category, constructors given in mkQCl IP -> VQ -> QS -> QCl -
who wonders who sleeps
+
who wonders who sleeps
mkQCl @@ -2725,17 +2725,17 @@ Lexical category, constructors given in a_Quant Quant -
a house
+
a house
mkQuant Pron -> Quant -
my house
+
my house
no_Quant Quant -
no house
+
no house
that_Quant @@ -2745,7 +2745,7 @@ Lexical category, constructors given in the_Quant Quant -
the house
+
the house
this_Quant @@ -2796,7 +2796,7 @@ Lexical category, constructors given in mkRCl RP -> VQ -> QS -> RCl -
woman who wonders who sleeps
+
woman who wonders who sleeps
mkRCl @@ -2881,7 +2881,7 @@ Lexical category, constructors given in mkRCl RP -> ClSlash -> RCl -
woman whom she loves today
+
woman whom she loves today
mkRCl @@ -3084,12 +3084,12 @@ Lexical category, constructors given in although_Subj Subj -
although she sleeps
+
although she sleeps
because_Subj Subj -
because she sleeps
+
because she sleeps
if_Subj @@ -3462,7 +3462,7 @@ Lexical category, constructors given in mkVP VQ -> QS -> VP -
to wonder who sleeps
+
to wonder who sleeps
mkVP @@ -3608,7 +3608,7 @@ Lexical category, constructors given in mkVPSlash V2Q -> QS -> VPSlash -
atomic term where_Idv
+
whom does she ask where I sleep
mkVPSlash diff --git a/lib/src/french/LexiconFre.gf b/lib/src/french/LexiconFre.gf index 20a81d501..598d5af2b 100644 --- a/lib/src/french/LexiconFre.gf +++ b/lib/src/french/LexiconFre.gf @@ -211,7 +211,7 @@ lin wine_N = regGenN "vin" masculine ; win_V2 = dirV2 (regV "gagner") ; ---- vaincre woman_N = regGenN "femme" feminine ; - wonder_VQ = mkVQ (reflV (regV "tonner")) ; + wonder_VQ = mkVQ (reflV (regV "demander")) ; wood_N = regGenN "bois" masculine ; write_V2 = crire_V2 ; yellow_A = regA "jaune" ;