Merge commit 'ede0fd55afd1f9ad00ed3c7eb6c2c6bb5ca2881b' into main

Conflicts:
	METADATA

Author: olzama

METADATA

@@ -24,9 +24,9 @@
 
 ## Grammar maintainers and contributors
 
-MAINTAINER=""
-CONTRIBUTORS=""
-CONTACT_EMAIL=""
+MAINTAINER="Olga Zamaraeva"
+CONTRIBUTORS="Montserrat Marimon, Lorena Suarez"
+CONTACT_EMAIL="[email protected]"
 
 ## Grammar name and web presence
 ## Note: if SHORT_GRAMMAR_NAME is not defined, the directory name is used.
@@ -37,19 +37,19 @@ WEBSITE=""
 DEMO_WEBSITE=""
 DOCUMENTATION_URL=""
 ISSUE_TRACKER=""
-LICENSE=""
+LICENSE="MIT"
 
 ## You may optionally specify a release date for the grammar. If unspecified,
 ## the grammar catalogue script will attempt to extract a date from the
 ## Version.l(i)sp file.
-LATEST_RELEASE=""
+LATEST_RELEASE="3.1"
 
 ## Citation data
 ## If this is not provided, the text of citation.bib or canonical.bib
 ## will be used in the Grammar Catalogue
 BIB_URL=""
 PDF_URL=""
-CITE=""
+CITE="Marimon 2010"
 
 ## Version Control
 ## If this is not provided, it is automatically extracted from the
@@ -61,7 +61,7 @@ VCS=""
 ## e.g.
 ## EXTERNAL_RESOURCES="TnT tagger; SPRouT named-entity tagger"
 
-EXTERNAL_RESOURCES=""
+EXTERNAL_RESOURCES="Freeling 4.1"
 
 ASSOCIATED_RESOURCES=""
 
@@ -81,7 +81,7 @@ ASSOCIATED_RESOURCES=""
 
 
 ## Uncomment one:
-#GRAMMAR_TYPE="Resource grammar"
+GRAMMAR_TYPE="Resource grammar"
 #GRAMMAR_TYPE="Treebank trained grammar"
 #GRAMMAR_TYPE="Medium-sized linguistic grammar"
 #GRAMMAR_TYPE="Experimental grammar"

generics.tdl

@@ -13,12 +13,13 @@
 
 ;n_-_mc_ge := n_-_mc_le &
 ;[ STEM < "n_-_mc_le" >,
-;  SYNSEM.LKEYS.KEYREL.PRED "_generic_n_rel".
-;  TRAITS generic_token_list ].
+;  SYNSEM.LKEYS.KEYREL.PRED "_generic_n_rel",
+;  TOKENS.+LIST generic_token_list ].
 
 ;n_pp_mc_ge := n_pp_mc_le &
 ;[ STEM < *top* >,
-;  SYNSEM.LKEYS.KEYREL.PRED "_generic_n_rel" ].
+;  SYNSEM.LKEYS.KEYREL.PRED "_generic_n_rel",
+;  TOKENS.+LIST generic_token_list ].
 
 ;;; Generic lexical entries for noun tags