unmarked subtype

  * Replaces nmod/obl:npmod/tmod
  * Uses of tmod can be emulated using lemma list in label_trees.py (e.g. for generating PTB NP-TMP)
  * See UniversalDependencies/docs#1028

_build/src/dep/GUM_academic_art.conllu

@@ -493,13 +493,13 @@
 22	for	_	_	_	_	23	case	_	_
 23	example	_	_	_	_	21	obl	_	_
 24	Brieber	_	_	_	_	21	obj	_	_
-25	2014	_	_	_	_	24	nmod:tmod	_	_
+25	2014	_	_	_	_	24	nmod:unmarked	_	_
 26	;	_	_	_	_	27	punct	_	_
 27	Binderman	_	_	_	_	24	conj	_	_
 28	et	_	_	_	_	29	cc	_	_
 29	al.	_	_	_	_	27	conj	_	_
 30	,	_	_	_	_	31	punct	_	_
-31	2005	_	_	_	_	23	nmod:tmod	_	_
+31	2005	_	_	_	_	23	nmod:unmarked	_	_
 32	)	_	_	_	_	21	punct	_	_
 33	and	_	_	_	_	38	cc	_	_
 34	at	_	_	_	_	37	case	_	_
@@ -525,15 +525,15 @@
 54	et	_	_	_	_	55	cc	_	_
 55	al.	_	_	_	_	52	conj	_	_
 56	,	_	_	_	_	57	punct	_	_
-57	2013	_	_	_	_	52	nmod:tmod	_	_
+57	2013	_	_	_	_	52	nmod:unmarked	_	_
 58	;	_	_	_	_	59	punct	_	_
 59	Heidenreich	_	_	_	_	52	conj	_	_
 60	&	_	_	_	_	61	cc	_	_
 61	Turano	_	_	_	_	59	conj	_	_
-62	2011	_	_	_	_	59	nmod:tmod	_	_
+62	2011	_	_	_	_	59	nmod:unmarked	_	_
 63	;	_	_	_	_	64	punct	_	_
 64	Milekic	_	_	_	_	52	conj	_	_
-65	2010	_	_	_	_	64	nmod:tmod	_	_
+65	2010	_	_	_	_	64	nmod:unmarked	_	_
 66	)	_	_	_	_	52	punct	_	_
 67	.	_	_	_	_	6	punct	_	_
 
@@ -603,7 +603,7 @@
 9	Baron	_	_	_	_	2	dep	_	_
 10	&	_	_	_	_	11	cc	_	_
 11	Beresford	_	_	_	_	9	conj	_	_
-12	2014	_	_	_	_	9	nmod:tmod	_	_
+12	2014	_	_	_	_	9	nmod:unmarked	_	_
 13	)	_	_	_	_	9	punct	_	_
 14	,	_	_	_	_	29	punct	_	_
 15	but	_	_	_	_	29	cc	_	_

_build/src/dep/GUM_academic_discrimination.conllu

@@ -969,7 +969,7 @@
 44	and	_	_	_	_	45	cc	_	_
 45	Scott	_	_	_	_	43	conj	_	_
 46	(	_	_	_	_	47	punct	_	_
-47	1981	_	_	_	_	43	nmod:tmod	_	_
+47	1981	_	_	_	_	43	nmod:unmarked	_	_
 48	[	_	_	_	_	49	punct	_	_
 49	22	_	_	_	_	47	dep	_	_
 50	]	_	_	_	_	49	punct	_	_

_build/src/dep/GUM_academic_economics.conllu

@@ -630,7 +630,7 @@
 18	by	_	_	_	_	20	case	_	_
 19	the	_	_	_	_	20	det	_	_
 20	state	_	_	_	_	15	nmod	_	_
-21	itself	_	_	_	_	20	nmod:npmod	_	_
+21	itself	_	_	_	_	20	nmod:unmarked	_	_
 22	—	_	_	_	_	25	punct	_	_
 23	and	_	_	_	_	25	cc	_	_
 24	for	_	_	_	_	25	mark	_	_
@@ -679,7 +679,7 @@
 4	is	_	_	_	_	6	cop	_	_
 5	the	_	_	_	_	6	det	_	_
 6	state	_	_	_	_	1	advcl	_	_
-7	itself	_	_	_	_	6	nmod:npmod	_	_
+7	itself	_	_	_	_	6	nmod:unmarked	_	_
 8	that	_	_	_	_	9	nsubj	_	_
 9	exhibits	_	_	_	_	6	advcl:relcl	_	_
 10	predatory	_	_	_	_	11	amod	_	_

_build/src/dep/GUM_academic_eegimaa.conllu

@@ -111,7 +111,7 @@
 23	(	_	_	_	_	24	punct	_	_
 24	Bassène	_	_	_	_	22	dep	_	_
 25	,	_	_	_	_	26	punct	_	_
-26	2007	_	_	_	_	24	nmod:tmod	_	_
+26	2007	_	_	_	_	24	nmod:unmarked	_	_
 27	)	_	_	_	_	24	punct	_	_
 28	and	_	_	_	_	29	cc	_	_
 29	11,200	_	_	_	_	22	conj	_	_
@@ -124,7 +124,7 @@
 36	&	_	_	_	_	37	cc	_	_
 37	Fennig	_	_	_	_	32	conj	_	_
 38	,	_	_	_	_	39	punct	_	_
-39	2014	_	_	_	_	32	nmod:tmod	_	_
+39	2014	_	_	_	_	32	nmod:unmarked	_	_
 40	)	_	_	_	_	32	punct	_	_
 41	.	_	_	_	_	5	punct	_	_
 
@@ -138,7 +138,7 @@
 8	Sapir	_	_	_	_	14	nmod:poss	_	_
 9	’s	_	_	_	_	8	case	_	_
 10	(	_	_	_	_	11	punct	_	_
-11	1971	_	_	_	_	8	nmod:tmod	_	_
+11	1971	_	_	_	_	8	nmod:unmarked	_	_
 12	)	_	_	_	_	11	punct	_	_
 13	BAK	_	_	_	_	14	compound	_	_
 14	group	_	_	_	_	6	nmod	_	_
@@ -355,7 +355,7 @@
 11	and	_	_	_	_	12	cc	_	_
 12	Gazio	_	_	_	_	10	conj	_	_
 13	(	_	_	_	_	14	punct	_	_
-14	1995	_	_	_	_	10	nmod:tmod	_	_
+14	1995	_	_	_	_	10	nmod:unmarked	_	_
 15	)	_	_	_	_	14	punct	_	_
 16	,	_	_	_	_	2	punct	_	_
 17	shows	_	_	_	_	0	root	_	_
@@ -717,7 +717,7 @@
 43	et	_	_	_	_	44	cc	_	_
 44	al.	_	_	_	_	42	conj	_	_
 45	,	_	_	_	_	46	punct	_	_
-46	2014	_	_	_	_	42	nmod:tmod	_	_
+46	2014	_	_	_	_	42	nmod:unmarked	_	_
 47	eds.	_	_	_	_	42	appos	_	_
 48	)	_	_	_	_	40	punct	_	_
 49	)	_	_	_	_	10	punct	_	_

_build/src/dep/GUM_academic_enjambment.conllu

@@ -72,7 +72,7 @@
 17	Domínguez	_	_	_	_	2	dep	_	_
 18	Caparrós	_	_	_	_	17	flat	_	_
 19	,	_	_	_	_	20	punct	_	_
-20	2000	_	_	_	_	17	nmod:tmod	_	_
+20	2000	_	_	_	_	17	nmod:unmarked	_	_
 21	:	_	_	_	_	22	punct	_	_
 22	103	_	_	_	_	20	dep	_	_
 23	)	_	_	_	_	17	punct	_	_
@@ -116,7 +116,7 @@
 61	-	_	_	_	_	60	punct	_	_
 62	Paje	_	_	_	_	60	flat	_	_
 63	,	_	_	_	_	64	punct	_	_
-64	1991	_	_	_	_	60	nmod:tmod	_	_
+64	1991	_	_	_	_	60	nmod:unmarked	_	_
 65	)	_	_	_	_	60	punct	_	_
 66	.	_	_	_	_	2	punct	_	_
 
@@ -154,7 +154,7 @@
 32	Martínez	_	_	_	_	31	obj	_	_
 33	Cantón	_	_	_	_	32	flat	_	_
 34	,	_	_	_	_	35	punct	_	_
-35	2011	_	_	_	_	32	nmod:tmod	_	_
+35	2011	_	_	_	_	32	nmod:unmarked	_	_
 36	for	_	_	_	_	38	case	_	_
 37	an	_	_	_	_	38	det	_	_
 38	overview	_	_	_	_	31	obl	_	_
@@ -165,25 +165,25 @@
 43	others	_	_	_	_	44	nmod	_	_
 44	Quilis	_	_	_	_	29	obl	_	_
 45	(	_	_	_	_	46	punct	_	_
-46	1964	_	_	_	_	44	nmod:tmod	_	_
+46	1964	_	_	_	_	44	nmod:unmarked	_	_
 47	)	_	_	_	_	46	punct	_	_
 48	,	_	_	_	_	49	punct	_	_
 49	Domínguez	_	_	_	_	44	conj	_	_
 50	Caparrós	_	_	_	_	49	flat	_	_
 51	,	_	_	_	_	53	punct	_	_
 52	(	_	_	_	_	53	punct	_	_
-53	2000	_	_	_	_	49	nmod:tmod	_	_
+53	2000	_	_	_	_	49	nmod:unmarked	_	_
 54	)	_	_	_	_	53	punct	_	_
 55	,	_	_	_	_	56	punct	_	_
 56	Paraíso	_	_	_	_	44	conj	_	_
 57	,	_	_	_	_	59	punct	_	_
 58	(	_	_	_	_	59	punct	_	_
-59	2000	_	_	_	_	56	nmod:tmod	_	_
+59	2000	_	_	_	_	56	nmod:unmarked	_	_
 60	)	_	_	_	_	59	punct	_	_
 61	,	_	_	_	_	62	punct	_	_
 62	Spang	_	_	_	_	44	conj	_	_
 63	(	_	_	_	_	64	punct	_	_
-64	1983	_	_	_	_	62	nmod:tmod	_	_
+64	1983	_	_	_	_	62	nmod:unmarked	_	_
 65	)	_	_	_	_	64	punct	_	_
 66	for	_	_	_	_	68	case	_	_
 67	a	_	_	_	_	68	det	_	_
@@ -194,23 +194,23 @@
 72	and	_	_	_	_	73	cc	_	_
 73	Alarcos	_	_	_	_	44	conj	_	_
 74	(	_	_	_	_	75	punct	_	_
-75	1966	_	_	_	_	73	nmod:tmod	_	_
+75	1966	_	_	_	_	73	nmod:unmarked	_	_
 76	)	_	_	_	_	75	punct	_	_
 77	,	_	_	_	_	78	punct	_	_
 78	Senabre	_	_	_	_	73	conj	_	_
 79	(	_	_	_	_	80	punct	_	_
-80	1982	_	_	_	_	78	nmod:tmod	_	_
+80	1982	_	_	_	_	78	nmod:unmarked	_	_
 81	)	_	_	_	_	80	punct	_	_
 82	,	_	_	_	_	83	punct	_	_
 83	Luján	_	_	_	_	73	conj	_	_
 84	(	_	_	_	_	85	punct	_	_
-85	2006	_	_	_	_	83	nmod:tmod	_	_
+85	2006	_	_	_	_	83	nmod:unmarked	_	_
 86	)	_	_	_	_	85	punct	_	_
 87	,	_	_	_	_	88	punct	_	_
 88	Martínez	_	_	_	_	73	conj	_	_
 89	Fernández	_	_	_	_	88	flat	_	_
 90	(	_	_	_	_	91	punct	_	_
-91	2010	_	_	_	_	88	nmod:tmod	_	_
+91	2010	_	_	_	_	88	nmod:unmarked	_	_
 92	)	_	_	_	_	91	punct	_	_
 93	for	_	_	_	_	96	case	_	_
 94	case	_	_	_	_	96	compound	_	_
@@ -246,7 +246,7 @@
 22	(	_	_	_	_	23	punct	_	_
 23	Moretti	_	_	_	_	21	dep	_	_
 24	,	_	_	_	_	25	punct	_	_
-25	2013	_	_	_	_	23	nmod:tmod	_	_
+25	2013	_	_	_	_	23	nmod:unmarked	_	_
 26	)	_	_	_	_	23	punct	_	_
 27	,	_	_	_	_	7	punct	_	_
 28	was	_	_	_	_	31	cop	_	_
@@ -373,7 +373,7 @@
 17	Martínez	_	_	_	_	12	dep	_	_
 18	Fernández	_	_	_	_	17	flat	_	_
 19	,	_	_	_	_	20	punct	_	_
-20	2010	_	_	_	_	17	nmod:tmod	_	_
+20	2010	_	_	_	_	17	nmod:unmarked	_	_
 21	)	_	_	_	_	17	punct	_	_
 22	.	_	_	_	_	12	punct	_	_
 
@@ -409,7 +409,7 @@
 6	Navarro	_	_	_	_	13	nmod:poss	_	_
 7	’s	_	_	_	_	6	case	_	_
 8	(	_	_	_	_	9	punct	_	_
-9	2016	_	_	_	_	6	nmod:tmod	_	_
+9	2016	_	_	_	_	6	nmod:unmarked	_	_
 10	)	_	_	_	_	9	punct	_	_
 11	automatic	_	_	_	_	13	amod	_	_
 12	metrical	_	_	_	_	13	amod	_	_
@@ -534,7 +534,7 @@
 13	(	_	_	_	_	14	punct	_	_
 14	Parry	_	_	_	_	7	dep	_	_
 15	(	_	_	_	_	16	punct	_	_
-16	1929	_	_	_	_	14	nmod:tmod	_	_
+16	1929	_	_	_	_	14	nmod:unmarked	_	_
 17	)	_	_	_	_	16	punct	_	_
 18	on	_	_	_	_	19	case	_	_
 19	Homer	_	_	_	_	14	nmod	_	_
@@ -543,7 +543,7 @@
 22	Flores	_	_	_	_	14	conj	_	_
 23	Gómez	_	_	_	_	22	flat	_	_
 24	(	_	_	_	_	25	punct	_	_
-25	1988	_	_	_	_	22	nmod:tmod	_	_
+25	1988	_	_	_	_	22	nmod:unmarked	_	_
 26	)	_	_	_	_	25	punct	_	_
 27	on	_	_	_	_	30	case	_	_
 28	early	_	_	_	_	30	amod	_	_
@@ -609,7 +609,7 @@
 
 1	Quilis	_	_	_	_	5	nsubj	_	_
 2	(	_	_	_	_	3	punct	_	_
-3	1964	_	_	_	_	1	nmod:tmod	_	_
+3	1964	_	_	_	_	1	nmod:unmarked	_	_
 4	)	_	_	_	_	3	punct	_	_
 5	performed	_	_	_	_	0	root	_	_
 6	poetry	_	_	_	_	7	compound	_	_
@@ -790,7 +790,7 @@
 6	,	_	_	_	_	4	punct	_	_
 7	Spang	_	_	_	_	11	nsubj	_	_
 8	(	_	_	_	_	9	punct	_	_
-9	1983	_	_	_	_	7	nmod:tmod	_	_
+9	1983	_	_	_	_	7	nmod:unmarked	_	_
 10	)	_	_	_	_	9	punct	_	_
 11	noted	_	_	_	_	0	root	_	_
 12	that	_	_	_	_	34	mark	_	_
@@ -863,7 +863,7 @@
 
 1	Quilis	_	_	_	_	8	nsubj	_	_
 2	(	_	_	_	_	3	punct	_	_
-3	1964	_	_	_	_	1	nmod:tmod	_	_
+3	1964	_	_	_	_	1	nmod:unmarked	_	_
 4	)	_	_	_	_	3	punct	_	_
 5	was	_	_	_	_	8	cop	_	_
 6	the	_	_	_	_	8	det	_	_
@@ -908,7 +908,7 @@
 24	Martínez	_	_	_	_	29	nsubj	_	_
 25	Cantón	_	_	_	_	24	flat	_	_
 26	(	_	_	_	_	27	punct	_	_
-27	2011	_	_	_	_	24	nmod:tmod	_	_
+27	2011	_	_	_	_	24	nmod:unmarked	_	_
 28	)	_	_	_	_	27	punct	_	_
 29	reviews	_	_	_	_	21	advcl	_	_
 30	.	_	_	_	_	5	punct	_	_

_build/src/dep/GUM_academic_exposure.conllu

@@ -606,7 +606,7 @@
 2	training	_	_	_	_	3	nsubj	_	_
 3	lasted	_	_	_	_	0	root	_	_
 4	varying	_	_	_	_	5	amod	_	_
-5	lengths	_	_	_	_	3	obl:tmod	_	_
+5	lengths	_	_	_	_	3	obl:unmarked	_	_
 6	of	_	_	_	_	7	case	_	_
 7	time	_	_	_	_	5	nmod	_	_
 8	,	_	_	_	_	13	punct	_	_

_build/src/dep/GUM_academic_games.conllu

@@ -140,7 +140,7 @@
 40	&	_	_	_	_	41	cc	_	_
 41	Bavelier	_	_	_	_	34	conj	_	_
 42	,	_	_	_	_	43	punct	_	_
-43	2010	_	_	_	_	34	nmod:tmod	_	_
+43	2010	_	_	_	_	34	nmod:unmarked	_	_
 44	)	_	_	_	_	34	punct	_	_
 45	;	_	_	_	_	48	punct	_	_
 46	on	_	_	_	_	48	case	_	_
@@ -155,7 +155,7 @@
 55	&	_	_	_	_	56	cc	_	_
 56	Bavelier	_	_	_	_	54	conj	_	_
 57	,	_	_	_	_	58	punct	_	_
-58	2010	_	_	_	_	54	nmod:tmod	_	_
+58	2010	_	_	_	_	54	nmod:unmarked	_	_
 59	;	_	_	_	_	60	punct	_	_
 60	Feng	_	_	_	_	54	conj	_	_
 61	,	_	_	_	_	62	punct	_	_
@@ -164,7 +164,7 @@
 64	&	_	_	_	_	65	cc	_	_
 65	Pratt	_	_	_	_	60	conj	_	_
 66	,	_	_	_	_	67	punct	_	_
-67	2007	_	_	_	_	60	nmod:tmod	_	_
+67	2007	_	_	_	_	60	nmod:unmarked	_	_
 68	)	_	_	_	_	54	punct	_	_
 69	;	_	_	_	_	73	punct	_	_
 70	and	_	_	_	_	73	cc	_	_
@@ -193,7 +193,7 @@
 93	&	_	_	_	_	94	cc	_	_
 94	Gratton	_	_	_	_	85	conj	_	_
 95	,	_	_	_	_	96	punct	_	_
-96	2008	_	_	_	_	85	nmod:tmod	_	_
+96	2008	_	_	_	_	85	nmod:unmarked	_	_
 97	)	_	_	_	_	85	punct	_	_
 98	.	_	_	_	_	16	punct	_	_
 
@@ -235,7 +235,7 @@
 36	&	_	_	_	_	37	cc	_	_
 37	Cómbita	_	_	_	_	32	conj	_	_
 38	,	_	_	_	_	39	punct	_	_
-39	2012	_	_	_	_	32	nmod:tmod	_	_
+39	2012	_	_	_	_	32	nmod:unmarked	_	_
 40	)	_	_	_	_	32	punct	_	_
 41	,	_	_	_	_	43	punct	_	_
 42	to	_	_	_	_	43	mark	_	_
@@ -268,7 +268,7 @@
 69	et	_	_	_	_	70	cc	_	_
 70	al.	_	_	_	_	68	conj	_	_
 71	,	_	_	_	_	72	punct	_	_
-72	2005	_	_	_	_	68	nmod:tmod	_	_
+72	2005	_	_	_	_	68	nmod:unmarked	_	_
 73	;	_	_	_	_	74	punct	_	_
 74	Thorell	_	_	_	_	68	conj	_	_
 75	,	_	_	_	_	76	punct	_	_
@@ -281,7 +281,7 @@
 82	&	_	_	_	_	83	cc	_	_
 83	Klingberg	_	_	_	_	74	conj	_	_
 84	,	_	_	_	_	85	punct	_	_
-85	2009	_	_	_	_	74	nmod:tmod	_	_
+85	2009	_	_	_	_	74	nmod:unmarked	_	_
 86	)	_	_	_	_	68	punct	_	_
 87	.	_	_	_	_	4	punct	_	_
 
@@ -416,11 +416,11 @@
 37	&	_	_	_	_	38	cc	_	_
 38	McFarlane	_	_	_	_	36	conj	_	_
 39	,	_	_	_	_	40	punct	_	_
-40	2004	_	_	_	_	36	nmod:tmod	_	_
+40	2004	_	_	_	_	36	nmod:unmarked	_	_
 41	;	_	_	_	_	42	punct	_	_
 42	Prensky	_	_	_	_	36	conj	_	_
 43	,	_	_	_	_	44	punct	_	_
-44	2005	_	_	_	_	42	nmod:tmod	_	_
+44	2005	_	_	_	_	42	nmod:unmarked	_	_
 45	)	_	_	_	_	36	punct	_	_
 46	.	_	_	_	_	3	punct	_	_
 
@@ -622,7 +622,7 @@
 22	7	_	_	_	_	25	nummod	_	_
 23	and	_	_	_	_	24	cc	_	_
 24	9	_	_	_	_	22	conj	_	_
-25	years	_	_	_	_	26	obl:tmod	_	_
+25	years	_	_	_	_	26	obl:unmarked	_	_
 26	old	_	_	_	_	21	xcomp	_	_
 27	(	_	_	_	_	29	punct	_	_
 28	M	_	_	_	_	29	nsubj	_	_
@@ -795,7 +795,7 @@
 21	(	_	_	_	_	23	punct	_	_
 22	p	_	_	_	_	23	nsubj	_	_
 23	<	_	_	_	_	20	parataxis	_	_
-24	0.05	_	_	_	_	23	obl:npmod	_	_
+24	0.05	_	_	_	_	23	obl:unmarked	_	_
 25	)	_	_	_	_	23	punct	_	_
 26	,	_	_	_	_	20	punct	_	_
 27	the	_	_	_	_	29	det	_	_