(gf2ud) label updates (#97)

* (gf2ud) add ConsNP "," rule
- use CCONJ instead of CONJ

* (gf2ud) dobj -> obj (ud 2 -> ud 1)
- clean up whitespace

* (gf2ud) fix eng labels
- comma exists in SSubjS, not SubjS
- add local rule for comma in VocNP
- auxpass (UD1) -> aux:pass (UD2)

src/Lang.labels

@@ -4,7 +4,7 @@ DirectComplVQ 	empty nsubj head ccomp  -- Temp argument can only be empty in Eng
 DirectComplVS	empty nsubj head ccomp  -- Temp argument can only be empty in English
 SlashVP	nsubj head
 SlashVS	nsubj head ccomp
-FocusObjS 	nsubj head              -- again might be wrong; more correct to call it dobj
+FocusObjS	nsubj head              -- again might be wrong; more correct to call it obj
 QuestIAdv	advmod head		-- "where does John sleep" cf. AdvVP
 QuestIComp	head nsubj	-- "where is John": John is clearly nsubj, but is where the head?
 QuestQVP	nsubj head
@@ -159,7 +159,7 @@ TQuestMark     head dep
 
 ComplV2	       head obj	-- shortcuts in App
 ComplV2V       head obj xcomp
-ComplV3	       head iobj obj   ---- could be dobj dobj
+ComplV3	       head iobj obj   ---- could be obj obj
 PassAgentV2    head ncomp	-- not sure
 RelV2	       mark nsubj head
 QuestV2	       obj nsubj head
@@ -181,7 +181,7 @@ AdV	ADV
 Adv	ADV
 CAdv	ADV
 Card	NUM
-Conj	CONJ
+Conj	CCONJ
 Det	DET
 Digits	NUM
 IAdv	ADV
@@ -194,7 +194,7 @@ N2	NOUN
 N3	NOUN
 Numeral	NUM
 Ord	NUM
-PConj	CONJ
+PConj	CCONJ
 PN	PROPN
 Predet	DET
 Prep	ADP
@@ -214,7 +214,3 @@ VA	VERB
 VQ	VERB
 VS	VERB
 VV	VERB
-
-
-
-

src/english/LangEng.labels

@@ -3,13 +3,13 @@ UseV,ComplVV,ComplVS,ComplVQ,ComplVA,SlashV2a,SlashV2V,SlashV2A,SlashV2S,Slash2V
 UseV,UseComp {"to"} PART mark head
 UseComp,CompAdv,CompAP,CompNP,CompCN,ProgrVP,QuestIComp {"is","are","am","was","were","been","be"} VERB cop head
 CompCN {"a","an"} DET det head
-PassV2 {"is","are","am","was","were""been","be"} VERB auxpass head
+PassV2 {"is","are","am","was","were""been","be"} VERB aux:pass head
 ComplVV {"to"} PART mark xcomp
 ComplVS {"that"} PART mark ccomp
 EmbedVP {"to"} PART mark head
 EmbedS {"that"} PART mark head
 SentCN {"that","to"} PART mark acl
-ExtAdvS,SubjS {","} PUNCT punct head
+ConsNP,ExtAdvS,SSubjS,VocNP {","} PUNCT punct head
 ExistNPAdv,ExistNP {"not","don't","doesn't","didn't","haven't","hasn't","hadn't","wouldn't","won't","isn't","aren't","wasn't","weren't"} PART neg head 
 ExistNPAdv,ExistNP {"has","had","have","will","would","do","does","did"} AUX aux head 
 ExistNPAdv,ExistNP {"is","are","am","was","were""been","be"} VERB cop head
@@ -34,9 +34,3 @@ PossNP,PartNP {"of"} ADP case nmod
 @"am" PresSg1
 @"is" PresSg3
 @"are" PresPl
-
-
-
-
-
-