diff --git a/lib/doc/MkSynopsis.hs b/lib/doc/MkSynopsis.hs index 9ef356d54..2fff82292 100644 --- a/lib/doc/MkSynopsis.hs +++ b/lib/doc/MkSynopsis.hs @@ -334,14 +334,13 @@ readFileC cod file = do case cod of "utf8" -> readFile file _ -> do - system $ "iconv -f ISO-8859-1 -t UTF-8 " ++ file ++ " >" ++ tmp + system $ "iconv -f " ++ cod ++ " -t UTF-8 " ++ file ++ " >" ++ tmp readFile tmp -- 'intelligently' determine the coding of a file +---- AR 5/6/2016: now utf8 is used for all languages except Bul, where no characters are shown in documentation anyway coding file = case language file of - "Pol" -> "utf8" - "Rus" -> "utf8" - "Mlt" -> "utf8" - _ -> "latin1" ---- + "Bul" -> "CP1251" --- "ISO-8859-1" + _ -> "utf8" language = reverse . take 3 . drop 3 . reverse diff --git a/lib/doc/synopsis-intro.txt b/lib/doc/synopsis-intro.txt index 09be88a5f..156b47094 100644 --- a/lib/doc/synopsis-intro.txt +++ b/lib/doc/synopsis-intro.txt @@ -68,6 +68,8 @@ Other relevant documents: - [RGL Documentation and Publications ./rgl-publications.html]: links to publications and other documentation - [More modules gfdoc/sources.html]: extra modules, dictionaries, and the internals of the resource grammar +- [Internal abstract syntax ./absfuns.html]: synopsis of internal +abstract functions and their Universal Dependency labels - [RGL Source Browser ./browse]: look up functions and their source code - [Minibar http://cloud.grammaticalframework.org/minibar/minibar.html]: find resource grammar expressions by parsing (select Grammar: LibraryBrowser) diff --git a/lib/doc/synopsis.html b/lib/doc/synopsis.html index 9a6472981..8b9933289 100644 --- a/lib/doc/synopsis.html +++ b/lib/doc/synopsis.html @@ -86,6 +86,8 @@ Other relevant documents:
  • RGL Documentation and Publications: links to publications and other documentation
  • More modules: extra modules, dictionaries, and the internals of the resource grammar +
  • Internal abstract syntax: synopsis of internal +abstract functions and their Universal Dependency labels
  • RGL Source Browser: look up functions and their source code
  • Minibar: find resource grammar expressions by parsing (select Grammar: LibraryBrowser) @@ -925,42 +927,42 @@ Lexical category, constructors given in mkCN N -> RS -> CN -
    man whom she loves
    +
    man that she loves
    mkCN CN -> RS -> CN -
    old man whom she loves
    +
    old man that she loves
    mkCN N -> Adv -> CN -
    house on the hill
    +
    house on the hill
    mkCN CN -> Adv -> CN -
    big house on the hill
    +
    big house on the hill
    mkCN CN -> S -> CN -
    rule that she sleeps
    +
    rule that she sleeps
    mkCN CN -> QS -> CN -
    question if she sleeps
    +
    question if she sleeps
    mkCN CN -> VP -> CN -
    reason to sleep
    +
    reason to sleep
    mkCN CN -> SC -> CN -
    reason to sleep
    +
    reason to sleep
    mkCN @@ -1152,7 +1154,7 @@ Lexical category, constructors given in mkCl NP -> RS -> Cl -
    it is she who sleeps
    +
    it is she that sleeps
    mkCl @@ -1203,7 +1205,7 @@ Lexical category, constructors given in mkClSlash Cl -> Prep -> ClSlash -
    with whom does she sleep
    +
    whom does she sleep with
    mkClSlash @@ -1379,7 +1381,7 @@ Lexical category, constructors given in much_Det Det -
    much wine
    +
    much wine
    somePl_Det @@ -2056,7 +2058,7 @@ Lexical category, constructors given in mkNP NP -> RS -> NP -
    John, who walks ...
    +
    John, that walks ...
    mkNP @@ -2823,122 +2825,122 @@ Lexical category, constructors given in mkRCl RP -> VP -> RCl -
    woman who always sleeps
    +
    woman that always sleeps
    mkRCl RP -> V -> RCl -
    woman who sleeps
    +
    woman that sleeps
    mkRCl RP -> V2 -> NP -> RCl -
    woman who loves him
    +
    woman that loves him
    mkRCl RP -> V3 -> NP -> NP -> RCl -
    woman who sends it to him
    +
    woman that sends it to him
    mkRCl RP -> VV -> VP -> RCl -
    woman who wants to sleep
    +
    woman that wants to sleep
    mkRCl RP -> VS -> S -> RCl -
    woman who says that I sleep
    +
    woman that says that I sleep
    mkRCl RP -> VQ -> QS -> RCl -
    woman who wonders who sleeps
    +
    woman that wonders who sleeps
    mkRCl RP -> VA -> A -> RCl -
    woman who becomes old
    +
    woman that becomes old
    mkRCl RP -> VA -> AP -> RCl -
    woman who becomes very old
    +
    woman that becomes very old
    mkRCl RP -> V2A -> NP -> A -> RCl -
    woman who paints it red
    +
    woman that paints it red
    mkRCl RP -> V2A -> NP -> AP -> RCl -
    woman who paints it very red
    +
    woman that paints it very red
    mkRCl RP -> V2S -> NP -> S -> RCl -
    woman who answers to him that we sleep
    +
    woman that answers to him that we sleep
    mkRCl RP -> V2Q -> NP -> QS -> RCl -
    woman who asks him who sleeps
    +
    woman that asks him who sleeps
    mkRCl RP -> V2V -> NP -> VP -> RCl -
    woman who begs him to sleep
    +
    woman that begs him to sleep
    mkRCl RP -> A -> RCl -
    woman who is old
    +
    woman that is old
    mkRCl RP -> A -> NP -> RCl -
    woman who is older than he
    +
    woman that is older than he
    mkRCl RP -> A2 -> NP -> RCl -
    woman who is married to him
    +
    woman that is married to him
    mkRCl RP -> AP -> RCl -
    woman who is very old
    +
    woman that is very old
    mkRCl RP -> NP -> RCl -
    woman who is the woman
    +
    woman that is the woman
    mkRCl RP -> N -> RCl -
    student who is a woman
    +
    student that is a woman
    mkRCl RP -> CN -> RCl -
    student who is an old woman
    +
    student that is an old woman
    mkRCl RP -> Adv -> RCl -
    woman who is here
    +
    woman that is here
    mkRCl RP -> NP -> V2 -> RCl -
    woman whom we love
    +
    woman that we love
    mkRCl RP -> ClSlash -> RCl -
    woman whom she loves today
    +
    woman that she loves today
    mkRCl @@ -2959,7 +2961,7 @@ Lexical category, constructors given in mkRP Prep -> NP -> RP -> RP -
    all the cities in whom
    +
    all the cities in which
    which_RP @@ -2980,7 +2982,7 @@ Lexical category, constructors given in mkRS (Tense) -> (Ant) -> (Pol) -> RCl -> RS -
    woman who wouldn't have slept
    +
    woman that wouldn't have slept
    mkRS @@ -2990,7 +2992,7 @@ Lexical category, constructors given in mkRS Conj -> RS -> RS -> RS -
    woman who sleeps or whom we love
    +
    woman that sleeps or that we love
    mkRS @@ -3655,27 +3657,27 @@ Lexical category, constructors given in mkVPSlash V3 -> NP -> VPSlash -
    to whom does she send it
    +
    whom does she send it to
    mkVPSlash V2A -> AP -> VPSlash -
    whom does she paint red
    +
    whom does she paint red
    mkVPSlash V2Q -> QS -> VPSlash -
    whom does she ask where I sleep
    +
    whom does she ask where I sleep
    mkVPSlash V2S -> S -> VPSlash -
    to whom does she answer that I sleep
    +
    whom does she answer that I sleep to
    mkVPSlash V2V -> VP -> VPSlash -
    whom does she beg to sleep
    +
    whom does she beg to sleep
    mkVPSlash @@ -4920,7 +4922,7 @@ source N -> Str -> N -compound, e.g. "número" + "de telèfon" +compound, e.g. "número" + "de telèfon" mkN2 @@ -4940,7 +4942,7 @@ source N -> Prep -> Prep -> N3 -e.g. connexió + genitive + dative +e.g. connexió + genitive + dative mkPN @@ -5318,12 +5320,12 @@ source AdvType -without "在" included +without "在" included zai_placeAdvType AdvType -with "在" included +with "在" included timeAdvType @@ -5581,7 +5583,7 @@ source V -> V -force auxiliary "være" +force auxiliary "være" depV @@ -6565,7 +6567,7 @@ source V -> Prep -> Prep -> V3 -e.g. rääkima, allative, elative +e.g. rääkima, allative, elative mkV3 @@ -6595,7 +6597,7 @@ source V -> Prep -> V2S -e.g. "ütlema" allative +e.g. "ütlema" allative mkV2S @@ -6620,12 +6622,12 @@ source V -> Prep -> V2V -e.g. "käskima" adessive +e.g. "käskima" adessive mkV2V Str -> V2V -e.g. "käskima" adessive +e.g. "käskima" adessive mkV2Vf @@ -6645,7 +6647,7 @@ source V -> Prep -> Prep -> V2A -e.g. "värvima" genitive translative +e.g. "värvima" genitive translative mkV2A @@ -6665,7 +6667,7 @@ source V -> Prep -> V2Q -e.g. "küsima" ablative +e.g. "küsima" ablative @@ -6763,32 +6765,32 @@ source InfForm -e.g. "tehdä" +e.g. "tehdä" infIness InfForm -e.g. "tekemässä" +e.g. "tekemässä" infElat InfForm -e.g. "tekemästä" +e.g. "tekemästä" infIllat InfForm -e.g. "tekemään" +e.g. "tekemään" infPresPart InfForm -e.g. "tekevän" +e.g. "tekevän" infPresPartAgr InfForm -e.g. "tekevänsä" +e.g. "tekevänsä" prePrep @@ -6867,12 +6869,12 @@ source N +(vesi,veden,vesiä : Str) -> N also different sg.gen mkN -(vesi,veden,vesiä,vettä : Str) -> N +(vesi,veden,vesiä,vettä : Str) -> N also different sg.part @@ -7018,17 +7020,17 @@ source V -> Str -> V -hakata päälle (particle verb) +hakata päälle (particle verb) mkV Str -> V -> V -laimin+lyödä (prefixed verb) +laimin+lyödä (prefixed verb) caseV Case -> V -> V -deviating subj. case, e.g. genitive "täytyä" +deviating subj. case, e.g. genitive "täytyä" vOlla @@ -7088,7 +7090,7 @@ source V -> Case -> V3 -siirtää, (accusative), illative +siirtää, (accusative), illative dirdirV3 @@ -7098,7 +7100,7 @@ source VV -e.g. "yrittää" (puhua) +e.g. "yrittää" (puhua) mkVV @@ -7118,7 +7120,7 @@ source VS -e.g. "väittää" +e.g. "väittää" mkVS @@ -7138,12 +7140,12 @@ source V -> Prep -> V2V -e.g. "käskeä" genitive + infFiilat +e.g. "käskeä" genitive + infFiilat mkV2V V -> Prep -> InfForm -> V2V -e.g. "kieltää" partitive infElat +e.g. "kieltää" partitive infElat mkV2V @@ -7163,7 +7165,7 @@ source V -> Prep -> InfForm -> V2V -e.g. "kieltää" partitive infElat +e.g. "kieltää" partitive infElat mkVA @@ -7183,7 +7185,7 @@ source V -> Prep -> V2Q -e.g. "kysyä" ablative +e.g. "kysyä" ablative mkAdV @@ -7243,7 +7245,7 @@ source Number -> N -> Case -> Det -paljon + False + partitive, ei yhtään + True + partitive +paljon + False + partitive, ei yhtään + True + partitive mkQuant @@ -7306,17 +7308,17 @@ source Prep -dative, usually constructed with "à " +dative, usually constructed with "à" mkPrep Str -> Prep -simple preposition (other than "de" and "à ") +simple preposition (other than "de" and "à") mkPrep Str -> Prep -> Prep -complex preposition e.g. "à côté de" +complex preposition e.g. "à côté de" mkN @@ -7331,7 +7333,7 @@ source N -> Str -> N -compound noun, e.g. numéro + de téléphone +compound noun, e.g. numéro + de téléphone mkN2 @@ -7361,7 +7363,7 @@ source A -predictable, e.g. cher-chère +predictable, e.g. cher-chère mkA @@ -7391,7 +7393,7 @@ source A -> Prep -> A2 -e.g. supérieur + dative +e.g. supérieur + dative mkAdv @@ -7406,7 +7408,7 @@ source AdA -modify adjective, e.g. très +modify adjective, e.g. très mkV @@ -7446,12 +7448,12 @@ source V -> V -force auxiliary to be être (default avoir) +force auxiliary to be être (default avoir) reflV V -> V -reflexive, implies auxiliary être, e.g. se demander +reflexive, implies auxiliary être, e.g. se demander mkV2 @@ -7501,7 +7503,7 @@ source V -> VV -"j'arrive à parler" +"j'arrive à parler" mkV2S @@ -7649,7 +7651,7 @@ source Gender -> N -worst case: mann, mann, manne, mannes, männer, männern +worst case: mann, mann, manne, mannes, männer, männern mkN @@ -7798,17 +7800,17 @@ source V +(führen : Str) -> V regular verb mkV -(sehen,sieht,sah,sähe,gesehen : Str) -> V +(sehen,sieht,sah,sähe,gesehen : Str) -> V irregular verb theme mkV -(geben, gibt, gib, gab, gäbe, gegeben : Str) -> V +(geben, gibt, gib, gab, gäbe, gegeben : Str) -> V worst-case verb @@ -7879,7 +7881,7 @@ source V -> Prep -> Prep -> V3 -sprechen + mit + über +sprechen + mit + über mkVS @@ -8056,7 +8058,7 @@ source N -> Prep -> N2 ---η μητέρα + γενική +N -> Prep -> N2 ---η μητέρα + γενική - @@ -10751,7 +10753,7 @@ source V -> V -force "være" as auxiliary (default "have") +force "være" as auxiliary (default "have") depV @@ -11488,6 +11490,26 @@ source V -> Str -> Case -> V2V +- + + +mkV2S +V -> Str -> Case -> V2S +- + + +mkV2Q +V -> Str -> Case -> V2Q +- + + +mkV2A +V -> Str -> Case -> V2A +- + + dirV2 V -> V2 "видеть", "любить" @@ -11801,7 +11823,7 @@ source N -> Str -> N -compound, e.g. "número" + "de teléfono" +compound, e.g. "número" + "de teléfono" mkN2 @@ -12109,7 +12131,7 @@ source N -> N -över + flöde +över + flöde changeCompoundN @@ -12129,7 +12151,7 @@ source N -> Prep -> Prep -> N3 -e.g. flyg - frÃ¥n - till +e.g. flyg - från - till mkPN @@ -12184,7 +12206,7 @@ source A -e.g. äkta +e.g. äkta irregAdv @@ -12199,7 +12221,7 @@ source Adv -postverbal, e.g. här +postverbal, e.g. här mkAdV @@ -12209,17 +12231,17 @@ source AdA -modify adjective, e.g. tämligen +modify adjective, e.g. tämligen mkV -(stämmer : Str) -> V +(stämmer : Str) -> V predictable verb: use present indicative mkV (slita, slet : Str) -> V -i/e/i, u/ö/u, u/a/u +i/e/i, u/ö/u, u/a/u mkV @@ -12228,13 +12250,13 @@ source V +(gå,går,gå,gick,gått,gången : Str) -> V worst case mkV V -> Str -> V -particle verb, e.g. passa - pÃ¥ +particle verb, e.g. passa - på depV @@ -12244,7 +12266,7 @@ source V -> V -reflexive verb, e.g. Ã¥ngra sig +reflexive verb, e.g. ångra sig mkV2