diff --git a/lib/resource-1.0/doc/MkSynopsis.hs b/lib/resource-1.0/doc/MkSynopsis.hs index 69a6d79e7..841148324 100644 --- a/lib/resource-1.0/doc/MkSynopsis.hs +++ b/lib/resource-1.0/doc/MkSynopsis.hs @@ -198,8 +198,9 @@ sortRules = groupBy sameCat . sortBy compareRules addLexicalCats :: Cats -> [Rules] -> [(String,Rules)] addLexicalCats cs rss = - sortBy (\x y -> compare (fst x) (fst y)) $ + map head $ groupBy fstEq $ sortBy (\x y -> compare (fst x) (fst y)) $ [ (resultCat r, rs) | rs@(r:_) <- rss] ++ [(n,[]) | (n,_,_) <- cs] + where fstEq p1 p2 = fst p1 == fst p2 resultCat :: (String,String,String) -> String resultCat (_,t,_) = last (words t) diff --git a/lib/resource-1.0/doc/synopsis.html b/lib/resource-1.0/doc/synopsis.html index 42194aa96..224af212d 100644 --- a/lib/resource-1.0/doc/synopsis.html +++ b/lib/resource-1.0/doc/synopsis.html @@ -23,32 +23,22 @@
  • A - one-place adjective
  • A2 - two-place adjective
  • AP - adjectival phrase -
  • AP - adjectival phrase
  • AdA - adjective-modifying adverb
  • AdN - numeral-modifying adverb -
  • AdN - numeral-modifying adverb
  • AdV - adverb directly attached to verb
  • Adv - verb-phrase-modifying adverb -
  • Adv - verb-phrase-modifying adverb -
  • Ant - anteriority
  • Ant - anteriority
  • CAdv - comparative adverb
  • CN - common noun (without determiner) -
  • CN - common noun (without determiner) -
  • Cl - declarative clause, with all tenses
  • Cl - declarative clause, with all tenses
  • Comp - complement of copula, such as AP
  • Conj - conjunction
  • DConj - distributed conjunction
  • Det - determiner phrase -
  • Det - determiner phrase -
  • IAdv - interrogative adverb
  • IAdv - interrogative adverb
  • IComp - interrogative complement of copula
  • IDet - interrogative determiner
  • IP - interrogative pronoun -
  • IP - interrogative pronoun -
  • Imp - imperative
  • Imp - imperative
  • ImpForm
  • ListAP @@ -59,48 +49,31 @@
  • N2 - relational noun
  • N3 - three-place relational noun
  • NP - noun phrase (subject or object) -
  • NP - noun phrase (subject or object) -
  • Num - cardinal number (used with QuantPl)
  • Num - cardinal number (used with QuantPl)
  • Numeral
  • Ord - ordinal number (used in Det) -
  • Ord - ordinal number (used in Det) -
  • PConj - phrase-beginning conjunction
  • PConj - phrase-beginning conjunction
  • PN - proper name
  • Phr - phrase in a text -
  • Phr - phrase in a text -
  • Pol - polarity
  • Pol - polarity
  • Predet - predeterminer (prefixed Quant)
  • Prep - preposition, or just case
  • Pron - personal pronoun
  • Punct
  • QCl - question clause, with all tenses -
  • QCl - question clause, with all tenses
  • QS - question -
  • QS - question -
  • Quant - quantifier with both sg and pl
  • Quant - quantifier with both sg and pl
  • QuantPl
  • QuantSg
  • RCl - relative clause, with all tenses -
  • RCl - relative clause, with all tenses -
  • RP - relative pronoun
  • RP - relative pronoun
  • RS - relative -
  • RS - relative -
  • S - declarative sentence
  • S - declarative sentence
  • SC - embedded sentence or question
  • Slash - clause missing NP (S/NP in GPSG) -
  • Slash - clause missing NP (S/NP in GPSG)
  • Subj - subjunction
  • Tense - tense -
  • Tense - tense
  • Text - text consisting of several phrases -
  • Text - text consisting of several phrases -
  • Utt - sentence, question, word...
  • Utt - sentence, question, word...
  • V - one-place verb
  • V2 - two-place verb @@ -108,26 +81,24 @@
  • V3 - three-place verb
  • VA - adjective-complement verb
  • VP - verb phrase -
  • VP - verb phrase
  • VQ - question-complement verb
  • VS - sentence-complement verb
  • VV - verb-phrase-complement verb
  • Voc - vocative or "please" -
  • Voc - vocative or "please" -
  • Structural Words -
  • Paradigms for Danish -
  • Paradigms for English -
  • Paradigms for Finnish -
  • Paradigms for French -
  • Paradigms for German -
  • Paradigms for Italian -
  • Paradigms for Norwegian -
  • Paradigms for Russian -
  • Paradigms for Spanish -
  • Paradigms for Swedish -
  • Browsing the libraries with GF commands -
  • An Example of Usage +
  • Structural Words +
  • Paradigms for Danish +
  • Paradigms for English +
  • Paradigms for Finnish +
  • Paradigms for French +
  • Paradigms for German +
  • Paradigms for Italian +
  • Paradigms for Norwegian +
  • Paradigms for Russian +
  • Paradigms for Spanish +
  • Paradigms for Swedish +
  • Browsing the libraries with GF commands +
  • An Example of Usage

    @@ -606,8 +577,6 @@ Source: http://www.cs.chalmers.se/~aarne/ - -

    AP - adjectival phrase

    AdA - adjective-modifying adverb

    @@ -625,8 +594,6 @@ Source: http://www.cs.chalmers.se/~aarne/ - -

    AdN - numeral-modifying adverb

    AdV - adverb directly attached to verb

    @@ -689,8 +656,6 @@ Source: http://www.cs.chalmers.se/~aarne/ - -

    Adv - verb-phrase-modifying adverb

    Ant - anteriority

    @@ -711,8 +676,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    Ant - anteriority

    CAdv - comparative adverb

    @@ -815,8 +778,6 @@ Source: http://www.cs.chalmers.se/~aarne/ - -

    CN - common noun (without determiner)

    Cl - declarative clause, with all tenses

    @@ -952,8 +913,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    Cl - declarative clause, with all tenses

    Comp - complement of copula, such as AP

    @@ -1040,8 +999,6 @@ Source: http://www.cs.chalmers.se/~aarne/ - -

    Det - determiner phrase

    IAdv - interrogative adverb

    @@ -1057,8 +1014,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    IAdv - interrogative adverb

    IComp - interrogative complement of copula

    @@ -1088,8 +1043,6 @@ Source: http://www.cs.chalmers.se/~aarne/ - -

    IP - interrogative pronoun

    Imp - imperative

    @@ -1115,8 +1068,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    Imp - imperative

    ImpForm

    @@ -1353,8 +1304,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    NP - noun phrase (subject or object)

    Num - cardinal number (used with QuantPl)

    @@ -1380,8 +1329,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    Num - cardinal number (used with QuantPl)

    Numeral

    @@ -1482,8 +1429,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    Ord - ordinal number (used in Det)

    PConj - phrase-beginning conjunction

    @@ -1499,8 +1444,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    PConj - phrase-beginning conjunction

    PN - proper name

    @@ -1543,8 +1486,6 @@ Source: http://www.cs.chalmers.se/~aarne/ - -

    Phr - phrase in a text

    Pol - polarity

    @@ -1565,8 +1506,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    Pol - polarity

    Predet - predeterminer (prefixed Quant)

    @@ -1648,8 +1587,6 @@ Source: http://www.cs.chalmers.se/~aarne/ - -

    QCl - question clause, with all tenses

    QS - question

    @@ -1675,8 +1612,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    QS - question

    Quant - quantifier with both sg and pl

    @@ -1697,8 +1632,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    Quant - quantifier with both sg and pl

    QuantPl

    @@ -1804,8 +1737,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    RCl - relative clause, with all tenses

    RP - relative pronoun

    @@ -1826,8 +1757,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    RP - relative pronoun

    RS - relative

    @@ -1848,8 +1777,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    RS - relative

    S - declarative sentence

    @@ -1895,8 +1822,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    S - declarative sentence

    SC - embedded sentence or question

    @@ -1929,8 +1854,6 @@ Source: http://www.cs.chalmers.se/~aarne/ - -

    Slash - clause missing NP (S/NP in GPSG)

    Subj - subjunction

    @@ -1963,8 +1886,6 @@ Source: http://www.cs.chalmers.se/~aarne/ - -

    Tense - tense

    Text - text consisting of several phrases

    @@ -2015,8 +1936,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    Text - text consisting of several phrases

    Utt - sentence, question, word...

    @@ -2082,8 +2001,6 @@ Source: http://www.cs.chalmers.se/~aarne/
    - -

    Utt - sentence, question, word...

    V - one-place verb

    @@ -2214,8 +2131,6 @@ Source: http://www.cs.chalmers.se/~aarne/ - -

    VP - verb phrase

    VQ - question-complement verb

    @@ -2237,9 +2152,7 @@ Source: http://www.cs.chalmers.se/~aarne/ - -

    Voc - vocative or "please"

    - +

    Structural Words

    Source: http://www.cs.chalmers.se/~aarne/GF/lib/resource/abstract/Structural.gf @@ -2635,7 +2548,7 @@ Source: http://www.cs.chalmers.se/~aar - +

    Paradigms for Danish

    source http://www.cs.chalmers.se/~aarne/GF/lib/resource/danish/ParadigmsDan.gf @@ -2879,7 +2792,7 @@ source http://www.cs.chalmers.se/~aarn - +

    Paradigms for English

    source http://www.cs.chalmers.se/~aarne/GF/lib/resource/english/ParadigmsEng.gf @@ -3107,7 +3020,7 @@ source http://www.cs.chalmers.se/~aar - +

    Paradigms for Finnish

    source http://www.cs.chalmers.se/~aarne/GF/lib/resource/finnish/ParadigmsFin.gf @@ -3443,7 +3356,7 @@ source http://www.cs.chalmers.se/~aar - +

    Paradigms for French

    source http://www.cs.chalmers.se/~aarne/GF/lib/resource/french/ParadigmsFre.gf @@ -3671,7 +3584,7 @@ source http://www.cs.chalmers.se/~aarn - +

    Paradigms for German

    source http://www.cs.chalmers.se/~aarne/GF/lib/resource/german/ParadigmsGer.gf @@ -3923,7 +3836,7 @@ source http://www.cs.chalmers.se/~aarn - +

    Paradigms for Italian

    source http://www.cs.chalmers.se/~aarne/GF/lib/resource/italian/ParadigmsIta.gf @@ -4155,7 +4068,7 @@ source http://www.cs.chalmers.se/~aar - +

    Paradigms for Norwegian

    source http://www.cs.chalmers.se/~aarne/GF/lib/resource/norwegian/ParadigmsNor.gf @@ -4399,7 +4312,7 @@ source http://www.cs.chalmers.se/~a - +

    Paradigms for Russian

    source http://www.cs.chalmers.se/~aarne/GF/lib/resource/russian/ParadigmsRus.gf @@ -4639,7 +4552,7 @@ source http://www.cs.chalmers.se/~aar - +

    Paradigms for Spanish

    source http://www.cs.chalmers.se/~aarne/GF/lib/resource/spanish/ParadigmsSpa.gf @@ -4871,7 +4784,7 @@ source http://www.cs.chalmers.se/~aar - +

    Paradigms for Swedish

    source http://www.cs.chalmers.se/~aarne/GF/lib/resource/swedish/ParadigmsSwe.gf @@ -5111,7 +5024,7 @@ source http://www.cs.chalmers.se/~aar - +

    Browsing the libraries with GF commands

    All of the following assume @@ -5148,7 +5061,7 @@ To view linearizations in all languages by parsing from English: > p -cat=S -lang=LangEng "this grammar is too big" | tb

    - +

    An Example of Usage

    The standard way of building an application has the following modules.