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_AdNmkCard almostAdN (mkCard (mkNumeral n8_Unit)) mkCard almost_AdN (mkCard (mkNumeral n8_Unit)) at_least_AdNmkAdN-> AdNmkCard (mkAdN more_CAdv) (mkCard (mkNumeral n8_Unit)) mkCard (mkAdN more_CAdv) (mkCard (mkNumeral n8_Unit)) mkCl-> VQ -> QS -> ClmkCl she_NP wonder_VQ (mkQS (mkQCl who_IP sleep_V)) mkCl she_NP wonder_VQ (mkQS (mkQCl who_IP sleep_V)) mkClaPl_DetmkNP aPl_Det woman_N mkUtt (mkNP aPl_Det woman_N) aSg_DetmkNP aSg_Det woman_N mkUtt (mkNP aSg_Det woman_N) a_DetmkNP a_Det house_N mkUtt (mkNP a_Det house_N) every_Detfew_Detfew_Det few_Det many_DetmkDet-> DetmkDet this_Quant mkDet this_Quant mkDetmuch_Detmuch_Det much_Det somePl_Detthat_DetmkNP that_Det woman_N mkUtt (mkNP that_Det woman_N) thePl_DetmkNP thePl_Det house_N mkUtt (mkNP thePl_Det house_N) theSg_DetmkNP theSg_Det house_N mkUtt (mkNP theSg_Det house_N) the_DetmkNP the_Det house_N mkUtt (mkNP the_Det house_N) these_DetmkNP these_Det woman_N mkUtt (mkNP these_Det woman_N) this_DetmkNP this_Det woman_N mkUtt (mkNP this_Det woman_N) those_DetmkNP those_Det woman_N mkUtt (mkNP those_Det woman_N) mkIAdv-> IP -> IAdvmkIAdv in_Prep (mkIP which_IQuant city_N) mkIAdv in_Prep (mkIP which_IQuant city_N) mkIAdvhow8many_IDetmkUtt (mkIP how8many_IDet house_N) mkUtt (mkIP how8many_IDet house_N) mkIDetwhatPl_IPwhatPl_IP whatPl_IP whatSg_IPwhatSg_IP whatSg_IP what_IPmkUtt what_IP mkUtt what_IP whoPl_IPmkImp-> ImpmkImp (mkVP (mkVP come_V) (mkAdv to_Prep (mkNP i_Pron house_N))) mkImp (mkVP (mkVP come_V) (mkAdv to_Prep (mkNP i_Pron house_N))) mkImpmkImp-> NP -> ImpmkImp buy_V2 it_NP mkImp buy_V2 it_NP everybody_NPeverybody_NP mkUtt everybody_NP everything_NPeverything_NP mkUtt everything_NP he_NPmkNP-> NPmkUtt (mkNP (mkCN old_A beer_N)) mkUtt (mkNP (mkCN old_A beer_N)) mkNP-> NPmkUtt (mkNP beer_N) mkUtt (mkNP beer_N) mkNPnobody_NPnobody_NP mkUtt nobody_NP nothing_NPnothing_NP mkUtt nothing_NP she_NPsomebody_NPsomebody_NP mkUtt somebody_NP something_NPsomething_NP mkUtt something_NP that_NPnot_PredetmkNP not_Predet everybody_NP mkUtt (mkNP not_Predet everybody_NP) only_Predethe_Pronhe_Pron mkUtt (mkNP he_Pron) i_Proni_Pron mkUtt (mkNP i_Pron) it_Pronit_Pron mkUtt (mkNP it_Pron) she_Pronshe_Pron mkUtt (mkNP she_Pron) they_Pronthey_Pron mkUtt (mkNP they_Pron) we_Pronwe_Pron mkUtt (mkNP we_Pron) youPl_PronyouPl_Pron mkUtt (mkNP youPl_Pron) youPol_PronyouPol_Pron mkUtt (mkNP youPol_Pron) youSg_PronyouSg_Pron mkUtt (mkNP youSg_Pron) mkQCl-> VQ -> QS -> QClmkQCl who_IP wonder_VQ (mkQS (mkQCl who_IP sleep_V)) mkQCl who_IP wonder_VQ (mkQS (mkQCl who_IP sleep_V)) mkQCla_QuantmkNP a_Quant house_N mkUtt (mkNP a_Quant house_N) mkQuant-> QuantmkNP (mkQuant i_Pron) house_N mkUtt (mkNP (mkQuant i_Pron) house_N) no_QuantmkNP no_Quant house_N mkUtt (mkNP no_Quant house_N) that_Quantthe_QuantmkNP the_Quant house_N mkUtt (mkNP the_Quant house_N) this_QuantmkRCl-> VQ -> QS -> RClmkCN woman_N (mkRS (mkRCl which_RP wonder_VQ (mkQS (mkQCl who_IP sleep_V)))) mkCN woman_N (mkRS (mkRCl which_RP wonder_VQ (mkQS (mkQCl who_IP sleep_V)))) mkRClmkRCl-> ClSlash -> RClmkCN woman_N (mkRS (mkRCl which_RP (mkClSlash (mkClSlash she_NP love_V2) today_Adv))) mkCN woman_N (mkRS (mkRCl which_RP (mkClSlash (mkClSlash she_NP love_V2) today_Adv))) mkRClalthough_SubjmkAdv although_Subj (mkS (mkCl she_NP sleep_V)) mkAdv although_Subj (mkS (mkCl she_NP sleep_V)) because_SubjmkAdv because_Subj (mkS (mkCl she_NP sleep_V)) mkAdv because_Subj (mkS (mkCl she_NP sleep_V)) if_SubjmkVP-> QS -> VPmkUtt (mkVP wonder_VQ (mkQS (mkQCl who_IP sleep_V))) mkUtt (mkVP wonder_VQ (mkQS (mkQCl who_IP sleep_V))) mkVPmkVPSlash-> QS -> VPSlashmkQCl 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