proiel-cli 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd7e52386cca5ac37ce9c85f06cda17bb63d9884
-  data.tar.gz: 6c5041e65cbefe03c183d978774acd2b2f714189
+  metadata.gz: 98027bdd669bde3fa19db4f6159e3b36d5024f1f
+  data.tar.gz: 4e6019add4436629e2488fc03d19f3d040c48149
 SHA512:
-  metadata.gz: 0701073c0214c33162ad3f031e4908314cf7da97cc5e7b63d7e990703ef3a8626f5b66984c681e08ef60b8fe7c6dbe5a9b6108f91e56d55b0aebb7907d602692
-  data.tar.gz: bfb2232432b4d46402c2eb824e4e57aba4091d3a90b7a20fc2d62bdcac25bd55914b6e1ee67d9a6d93eaf6efe573e589bb7d5a6ed60de7d9de597dd2b7122fb6
+  metadata.gz: 301a294838fb2ee805bcabbdb5425d39815749c8d4ccea9e8f7883ccaee4fee09ffb0cd45ad8ea0bef06cfb7b80a241b4acb87d224079101863be2d8f0614c7a
+  data.tar.gz: ca1bbaadca8be10e714984ab8ae1f460e6c61d3e5c7b09882c8819e95aadcccc152c69e53e1bd0072be6fc30491c422a84c6886fbd4f7f203b17cfa517f92310

data/README.md

@@ -12,25 +12,31 @@ gem install proiel-cli
 
 ## Using the command-line interface
 
-The gem includes a command-line utility `proiel` for a number of routine tasks.
-`proiel info`, for example, displays metadata and some brief statistics, and
-`proiel convert conll` converts the treebank to CoNLL format. Use `proiel
---help` for further examples and usage instructions.
+This gem includes a command-line utility, `proiel`, which solves various routine tasks involving PROIEL-style treebanks.
 
-To use the `visualize` command you will need a local installation of [graphviz](http://graphviz.org). More specifically, the `dot` command must be available in the path.
+`proiel info`, for example, displays metadata and some brief statistics, and `proiel convert conll` converts the treebank to CoNLL format. Use `proiel --help` for further examples and usage instructions.
 
-## Development
+To use the `visualize` command you will need to have [graphviz](http://graphviz.org) installed. On macOS you can use [Homebrew](https://brew.sh/) for this:
 
-Check out the git repository from github and run `bin/setup` to install
-development dependencies. Then run `rake` to run the tests.
+```shell
+brew install graphviz
+```
 
-To install a development version of this gem, run `bundle exec rake install`.
-To release a new version, update the version number in `version.rb`, and then
-run `bundle exec rake release`, which will create a git tag for the version,
-push git commits and tags, and push the gem to
-[rubygems.org](https://rubygems.org).
+Make sure that the `dot` command is available in the path:
+
+```shell
+$ which dot
+/usr/local/bin/dot
+```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at
-https://github.com/proiel/proiel-cli.
+Bug reports and pull requests are welcome on [GitHub](https://github.com/proiel/proiel-cli/issues).
+
+## Development
+
+To contribute to development, check out the git repository from [GitHub](https://github.com/proiel/proiel-cli) and run `bin/setup` to install all development dependencies. Then run `rake` to run the tests.
+
+To install a development version of this gem, run `bundle exec rake install`.
+
+To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the gem to [rubygems.org](https://rubygems.org).

data/lib/proiel/cli/converters/conll-u.rb

@@ -1,6 +1,12 @@
 require 'proiel/cli/converters/conll-u/morphology'
 require 'proiel/cli/converters/conll-u/syntax'
 
+# Unlike other conversions, this one has to rely on
+# certain assumptions about correct linguistic
+# annotation in order to produce a meaningful
+# representation in CoNLL-U
+
+
 module PROIEL
   module Converter
     class CoNLLU
@@ -13,16 +19,19 @@ module PROIEL
               div.sentences.each do |sentence|
                 sentence_count += 1
                 n = Sentence.new sentence
-                # Unlike other conversions, this one has to rely on
-                # certain assumptions about correct linguistic
-                # annotation in order to producea meaningful
-                # representation in CoNLL-U
                 begin
-                  puts n.convert.to_conll
+                  # Do the conversion first to avoid spurious headers if the conversion fails
+                  a = n.convert.to_conll
+                  puts "# source = #{source.title}, #{div.title}"
+                  # using printable_form would give us punctuation, which must then be added to the tree
+                  puts "# text = #{sentence.tokens.map(&:form).compact.join(' ')}"
+                  puts "# sent_id = #{sentence.id}"
+                  puts a
                   puts
                 rescue => e
                   error_count += 1
                   STDERR.puts "Cannot convert #{sentence.id} (#{sentence.citation}): #{e}"
+                  STDERR.puts e.backtrace.join("\n") unless e.is_a? RuntimeError
                 end
               end
             end
@@ -40,16 +49,55 @@ module PROIEL
 
           id_to_number = Hash.new(0) #will return id 0 (i.e. root) for nil
 
-          tk = sentence.tokens.reject { |t| t.empty_token_sort == 'P' }
+          # initialize array to hold the sentence tokens
+          tks = []
+          # keep track of how many new tokens have been created
+          offset = 0
           
-          tk.map(&:id).each_with_index.each do |id, i|
+          sentence.tokens.reject { |t| t.empty_token_sort == 'P' }.each do |tk|
+
+            if tk.form =~ /[[:space:]]/
+              subtoks = tk.form.split(/[[:space:]]/)
+              
+              subtoks.each_with_index do |subtok, i|
+                tks << PROIEL::Token.new(sentence,
+                                 (i == 0 ? tk.id : 1000 + offset), # id
+                                 (i == 0 ? tk.head_id : tk.id), # head_id
+                                 subtok,
+                                 # hope the lemmas split the same way as the tokens. Grab the form is you don't find a lemma
+                                 (tk.lemma.split(/[[:space:]]/)[i] || subtok), 
+                                 tk.part_of_speech, # copy the postag
+                                 tk.morphology,
+                                 (i == 0 ? tk.relation : "flat"),
+                                 nil, #empty_token_sort
+                                 tk.citation_part,
+                                 (i == 0 ? tk.presentation_before : nil),
+                                 (i == (subtoks.size - 1)  ? tk.presentation_after : nil), 
+                                 (i == 0 ? tk.antecedent_id : nil),
+                                 (i == 0 ? tk.information_status : nil),
+                                 (i == 0 ? tk.contrast_group : nil),
+                                 (i == 0 ? tk.foreign_ids : nil),
+                                 (i == 0 ? tk.slashes.map { |rel, target| PROIEL::PROIELXML::Reader::Slash.new({:'target_id' => target, :relation => rel} ) } : []), #  This needs to be given a real slash object for the initialization, although it throws away the info
+                                 (subtok == subtoks.first ? tk.alignment_id : nil)
+                                )
+                offset += 1
+              end
+            else
+              tks << tk
+            end
+          end
+
+          
+          tks.map(&:id).each_with_index.each do |id, i|
             id_to_number[id] = i + 1
           end
 
-          @tokens = tk.map do |t|
+          @tokens = tks.map do |t|
+
             Token.new(id_to_number[t.id],
                       id_to_number[t.head_id],
-                      t.form.to_s.gsub(/[[:space:]]/, '.'),
+                      #insert dots in any whitespace inside words and lemmata
+                      t.form.to_s.gsub(/[[:space:]]/, '.'), 
                       t.lemma.to_s.gsub(/[[:space:]]/, '.'),
                       t.part_of_speech,
                       t.language,
@@ -197,11 +245,19 @@ module PROIEL
         res.compact.join('|')
         end
 
+        def genitive?
+          @morphology =~ /......g.*/
+        end
+
         # returns +true+ if the node is an adjective or an ordinal
         def adjectival?
           @part_of_speech == 'A-' or @part_of_speech == 'Mo'
         end
 
+        def subjunction?
+          @part_of_speech == 'G-'
+        end
+
         def adverb?
           @part_of_speech =~ /\AD/
         end
@@ -236,6 +292,10 @@ module PROIEL
            dependents.any? { |d| d.relation == 'xobj' } )
         end
 
+        def auxiliary?
+          AUXILIARIES.include?([lemma, part_of_speech, language].join(','))
+        end
+          
         def determiner?
           DETERMINERS.include? @part_of_speech
         end
@@ -260,8 +320,16 @@ module PROIEL
           !has_content?
         end
 
+        def deponent?
+          DEPONENTS[@language] and DEPONENTS[@language].match(@lemma)
+        end
+
         def mediopassive?
-          @morphology[4] =~/[mpe]/
+          (!deponent? and @morphology) ? @morphology[4] =~/[mpe]/ : false
+        end
+
+        def passive?
+          (!deponent? and @morphology) ? @morphology[4] == 'p' : false
         end
 
         def negation?
@@ -277,15 +345,19 @@ module PROIEL
             d.determiner? and ['atr', 'aux', 'det'].include? d.relation
           end
         end
-
+        
+        def TAM_particle?
+          @relation == 'aux' and TAM_PARTICLE_LEMMATA.include?([lemma, part_of_speech, language].join(','))
+        end
+        
         def particle?
           @relation == 'aux' and PARTICLE_LEMMATA.include?([lemma, part_of_speech, language].join(','))
         end
 
-        def passive?
-          @morphology[4] == 'p'
+        def pronominal?
+          @part_of_speech =~ /\AP[^st]/ # no evidence that possessives are pronoun/determiner-like
         end
-
+        
         def preposition?
           @part_of_speech == 'R-'
         end
@@ -343,7 +415,7 @@ module PROIEL
             features.split("|").sort.join("|")
           end
         end
-        
+
         def to_conll
           [@id, 
            @form, 
@@ -390,12 +462,24 @@ module PROIEL
           end
         end
 
+        def find_postag possible_postags
+          tag, crit, feats = possible_postags.shift
+          if tag.nil?
+            # raise "Found no postag"
+          elsif crit.call self
+            @upos = tag
+            @features += ((@features.empty? ? '' : '|') + feats) if feats
+          else
+            find_postag possible_postags
+          end
+        end
+        
         def find_relation possible_relations
           rel, crit = possible_relations.shift
           if rel.nil?
           # raise "Found no relation"
           elsif crit.call self
-            @relation = rel
+            rel
           else
             find_relation possible_relations
           end
@@ -403,25 +487,29 @@ module PROIEL
 
         def map_part_of_speech!
           dependents.each(&:map_part_of_speech!)
-          @upos = POS_MAP[@part_of_speech].first
-          raise "No match found for pos #{part_of_speech.inspect}" unless @upos
-          if feat = POS_MAP[@part_of_speech][1]
-            @features += ((@features.empty? ? '' : '|') + feat)
-          end
+          possible_postags = POS_MAP[@part_of_speech]
+          find_postag possible_postags.dup
           # ugly, but the ugliness comes from UDEP
           @upos = 'ADJ' if @upos == 'DET' and @relation != 'det'
         end
 
         def relabel_graph!
           dependents.each(&:relabel_graph!)
+          # TODO: if there are iobjs without an obj among the dependents, one of them should be promoted to obj
+          @relation = map_relation
+          raise "No relation for #{form}" unless @relation
+        end
+
+        def map_relation
           possible_relations = RELATION_MAPPING[@relation]
           case possible_relations
           when String
-            @relation = possible_relations
+            possible_relations
           when Array
-            find_relation possible_relations.dup
+            x = find_relation possible_relations.dup
           when nil
-          # do nothing: the token has already changed its relation
+            # do nothing: the token has already changed its relation
+            @relation
           else
             raise "Unknown value #{possible_relations.inspect} for #{@relation}"
           end
@@ -447,35 +535,28 @@ module PROIEL
           end
         end
 
-
-
-        # TODO: process "implicit pid" through APOS chain too
         def process_ellipsis!
-          # First we find the corresponding overt token.
-          # If there's an explicit pid slash, we'll grab that one.
-          if pid and !subgraph_set.include?(pid)
-            overt = pid
-          # otherwise, try a conjunct
-          elsif @relation == 'conj'
-            overt = conj_head
-          elsif @relation == 'apos'
-            overt = find_appositive_head
-          else
+          aux = dependents.select(&:auxiliary?).first
+          if aux
+            aux.promote! 
             return
           end
 
-          dependents.each do |d|
+          new_head = find_highest_daughter
+          new_head.promote!('orphan')
+          
+#          dependents.each do |d|
             # check if there's a partner with the same relation under the overt node.
             # TODO: this isn't really very convincing when it comes to ADVs
-            if partner = overt.dependents.select { |p| p != self and p.relation == d.relation }.first #inserted p != self
-              partner = partner.find_remnant
-              d.head_id = partner.id
-              d.relation = 'remnant'
+#            if partner = overt.dependents.select { |p| p != self and p.relation == d.relation }.first #inserted p != self
+#              partner = partner.find_remnant
+#              d.head_id = partner.id
+#              d.relation = 'remnant'
             # if there's no partner, just attach under the overt node, preserving the relation
-            else
-              d.head_id = overt.id
-            end
-          end
+#            else
+#              d.head_id = overt.id
+#            end
+#          end
           @sentence.remove_token!(self)
         end
 
@@ -487,12 +568,20 @@ module PROIEL
           end
         end
 
+        def find_highest_daughter
+          dependents.min_by { |d| OBLIQUENESS_HIERARCHY.find_index(d.map_relation[/[^:]*/]) || 1000 }
+        end
+
         def process_copula!
           predicates = dependents.select { |d| d.relation == 'xobj' }
           raise "#{predicates.size} predicates under #{to_n}\n#{to_graph}" if predicates.size != 1
           predicates.first.promote!(nil, 'cop')
         end
 
+        def has_preposition?
+          dependents.any? { |d| d.preposition? and d.relation == "case" }
+        end
+
         def process_preposition!
           raise "Only prepositions can be processed this way!" unless part_of_speech == 'R-'
           obliques = dependents.select { |d| d.relation == 'obl' }
@@ -519,9 +608,9 @@ module PROIEL
           raise "Only coordinations can be processed this way!" unless conjunction?
           return if dependents.reject { |d| d.relation == 'aux' }.empty?
           distribute_shared_modifiers!
-          dependents.reject { |d| d.relation == 'aux' }.first.promote!("conj", "cc")
+          dependents.reject { |d| d.relation == 'aux' }.sort_by { |d| d.left_corner.id }.first.promote!("conj", "cc")
         end
-
+        
         def distribute_shared_modifiers!
           raise "Can only distribute over a conjunction!" unless conjunction?
           conjuncts, modifiers  = dependents.reject { |d| d.relation == 'aux' }.partition { |d|  d.relation == @relation or (d.relation == 'adv' and @relation == 'xadv') }

data/lib/proiel/cli/converters/conll-u/morphology.rb

@@ -2,8 +2,13 @@
 module PROIEL
   module Converter
     class CoNLLU
+
+      # try to guess deponency based on the lemma
+      DEPONENTS = { 'lat' => /r\Z/,
+                    'grc' => /ομαι\Z/ }
       COPULAR_LEMMATA = ['sum,V-,lat', 'εἰμί#1,V-,grc']
-      DETERMINERS = ['S-', 'Pd', 'Px', 'Ps', 'Pt']
+      AUXILIARIES = COPULAR_LEMMATA + []
+      DETERMINERS = ['S-', 'Pd', 'Px'] 
       NEGATION_LEMMATA = ['non,Df,lat', 'ne,Df,lat', 
                           'μή,Df,grc',
                           'μήγε,Df,grc',
@@ -35,8 +40,10 @@ module PROIEL
                           'nibai#2,Df,got',
                           'nih,Df,got',
                          ]
-
-
+      
+      TAM_PARTICLE_LEMMATA = ['ἄν,Df,grc',
+                             ]
+                              
       PARTICLE_LEMMATA = [ 'at,Df,lat',
                            'atque,Df,lat',
                            'autem,Df,lat',
@@ -59,7 +66,6 @@ module PROIEL
                            'tunc,Df,lat',
                            'vero,Df,lat',
                            'ἅμα,Df,grc',
-                           'ἄν,Df,grc',
                            'ἀνά,Df,grc',
                            'ἆρα,Df,grc',
                            'ἄραγε,Df,grc',
@@ -137,33 +143,39 @@ module PROIEL
       
       POS_MAP = 
         { 
-          'A-' => ['ADJ'],
-          'Df' => ['ADV'],
-          'S-' => ['DET', "Definite=Def|PronType=Dem"], # (we only have definite articles)
-          'Ma' => ['NUM'], 
-          'Nb' => ['NOUN'],
-          'C-' => ['CONJ'],
-          'Pd' => ['DET'], 
-          'F-' => ['X'],
-          'Px' => ['PRON'], 
-          'N-' => ['SCONJ'], #irrelevant for our purposes
-          'I-' => ['INTJ'],
-          'Du' => ['ADV', "PronType=Int"],
-          'Pi' => ['PRON', "PronType=Int"],
-          'Mo' => ['ADJ'], 
-          'Pp' => ['PRON', "PronType=Prs"],
-          'Pk' => ['PRON', "PronType=Prs|Reflex=Yes"],
-          'Ps' => ['PRON', "PronType=Prs|Poss=Yes"],   ###  layered gender?
-          'Pt' => ['PRON', "PronType=Prs|Poss=Yes|Reflex=Yes" ],   ###  layered gender? 
-          'R-' => ['ADP'],
-          'Ne' => ['PROPN'],
-          'Py' => ['DET'], 
-          'Pc' => ['PRON', "PronType=Rcp"],
-          'Dq' => ['ADV', "PronType=Rel"],
-          'Pr' => ['PRON', "PronType=Rel"],
-          'G-' => ['SCONJ'],
-          'V-' => ['VERB'],
-          'X-' => ['X'] }
+          'A-' => [['ADJ', lambda { |x| true } ]],
+          'C-' => [['CCONJ', lambda { |x| true } ]],
+          'Df' => [['AUX', lambda(&:TAM_particle?)],
+                   ['ADV', lambda(&:negation?), "Polarity=Neg"],
+                   ['ADV', lambda { |x| true } ]
+                  ],
+          'Dq' => [['ADV', lambda { |x| true }, "PronType=Rel"]],
+          'Du' => [['ADV', lambda { |x| true }, "PronType=Int"]],
+          'F-' => [['X', lambda { |x| true } ]],
+          'G-' => [['SCONJ', lambda { |x| true } ]],
+          'I-' => [['INTJ', lambda { |x| true } ]],
+          'Ma' => [['NUM', lambda { |x| true } ]], 
+          'Mo' => [['ADJ', lambda { |x| true } ]], 
+          'N-' => [['SCONJ', lambda { |x| true } ]], #irrelevant for our purposes
+          'Nb' => [['NOUN', lambda { |x| true } ]],
+          'Ne' => [['PROPN', lambda { |x| true } ]],
+          'Pc' => [['PRON', lambda { |x| true }, "PronType=Rcp"]],
+          'Pd' => [['DET', lambda { |x| true } ]], 
+          'Pi' => [['PRON', lambda { |x| true }, "PronType=Int"]],
+          'Pk' => [['AUX', lambda { |x| x.relation == 'aux' }],
+                   ['PRON', lambda { |x| true }, "PronType=Prs|Reflex=Yes"]],
+          'Pp' => [['PRON', lambda { |x| true }, "PronType=Prs"]],
+          'Pr' => [['PRON', lambda { |x| true }, "PronType=Rel"]],
+          'Ps' => [['ADJ', lambda { |x| true }, "Poss=Yes"]],   ###  NB no evidence for a pronominal/determiner-like nature here
+          'Pt' => [['ADJ', lambda { |x| true }, "Poss=Yes|Reflex=Yes" ]],   ###  NB no evidence for a pronominal/determiner-like nature here
+          'Px' => [['DET', lambda { |x| true } ]], 
+          'Py' => [['PRON', lambda { |x| true } ]], 
+          'R-' => [['ADP', lambda { |x| true } ]],
+          'V-' => [['AUX', lambda(&:auxiliary?)],
+                   ['VERB', lambda { |x| true } ]],
+          'S-' => [['DET', lambda { |x| true }, "Definite=Def|PronType=Dem"]], # (we only have definite articles)
+          'X-' => [['X', lambda { |x| true } ]]
+                  }
       
       MORPHOLOGY_MAP = {
         :person => {'1' => 'Person=1', 

data/lib/proiel/cli/converters/conll-u/syntax.rb

@@ -1,16 +1,19 @@
 module PROIEL
   module Converter
     class CoNLLU
+
+      OBLIQUENESS_HIERARCHY = ["nsubj", "obj", "iobj", "obl", "advmod", "csubj", "xcomp", "ccomp", "advcl"]
+      
       RELATION_MAPPING = {
         "adnom" => "dep",
         "adv" =>  [["advcl", lambda(&:clausal?) ],
                    ["advmod", lambda { |x| x.adverb? or x.preposition? } ],
                    ["advmod", lambda(&:adjectival?) ], # adjective for adverb
-                   ["nmod", lambda(&:nominal?) ],
+                   ["obl", lambda(&:nominal?) ], 
                    ["advmod", lambda { |x| true } ],
                   ],
-        "ag" => "nmod", # add :agent" once defined
-        "apos" => [["name", lambda { |x| x.proper_noun? and x.head and x.head.proper_noun? } ],
+        "ag" => "obl:agent", # add :agent" once defined
+        "apos" => [["flat:name", lambda { |x| x.proper_noun? and x.head and x.head.proper_noun? } ],
                    ["appos", lambda { |x| (x.nominal? or x.adjectival?) and x.head and x.head.nominal? } ],
                    ["acl", lambda { |x| x.clausal? and x.head and x.head.nominal? } ],  # add :relcl ?
                    # what to do about sentential appositions?
@@ -19,44 +22,48 @@ module PROIEL
                   ],
         "arg" => "dep",
         "atr" => [["nummod", lambda(&:cardinal?) ],
-                  ["nmod", lambda(&:nominal?) ],
+                  ["det", lambda { |x| x.pronominal? and !(!x.genitive? and x.head and x.head.genitive?) } ], #TODO check
+                  ["nmod", lambda(&:nominal?) ], 
                   ["acl", lambda { |x| x.clausal? } ],  # add :relcl?
                   ["advmod", lambda { |x| x.head and x.head.clausal? } ],
-                  ["det", lambda(&:determiner?) ],
                   ["amod", lambda { |x| true } ], #default
                  ],
         "aux" => [["det", lambda(&:determiner?) ],
-                  ["auxpass", lambda { |x| x.clausal? and x.head.passive?  } ],  
-                  ["aux", lambda(&:clausal?) ],
-                  ["neg", lambda(&:negation?) ],
+                  ["aux:pass", lambda { |x| x.clausal? and x.head.passive?  } ],
+                  ["aux", lambda(&:clausal?) ], #v2 probably want the modal particle an to go here too in 
+                  ["advmod", lambda(&:negation?) ],
                   ["discourse", lambda { |x| x.particle? or x.interjection? } ],
-                  ["advmod", lambda { |x| x.adjectival? or x.adverb? } ], # or subjunction (? why did I write this?)
+                  # include subjunctions that are aux here; (root sentences with subjunction)
+                  ["advmod", lambda { |x| x.adjectival? or x.adverb? or x.subjunction? } ],
                   ["cc", lambda(&:conjunction?) ],
-                  ["foreign", lambda(&:foreign?) ],
+                  ["flat:foreign", lambda(&:foreign?) ],
                   # We need some more distinctions to get Gothic and Armenian. Introduce language in the treebank? (Read from xml)
-                  ["mark", lambda { |x| ['Pk', 'R-'].include? x.part_of_speech  } ], #reflexive as valency reducer, 'R-' as infinitive marker in Gothic
+                  ["mark", lambda { |x| ['R-'].include? x.part_of_speech  } ], #'R-' as infinitive marker in Gothic
+                  ["aux", lambda { |x| ['Pk' ].include? x.part_of_speech  } ], #reflexive as valency reducer
                   ['amod', lambda { |x| x.preposition? } ], # Armenian DOM
-                  ['mwe', lambda { |x| ['Px', 'Pr'].include? x.part_of_speech } ], # NB there are a lot of bogus annotations with 'Px'
+                  ['fixed', lambda { |x| ['Px', 'Pr'].include? x.part_of_speech } ], # NB there are a lot of bogus annotations with 'Px'
                   
                   # MISANNOTATION  IF A NOUN or a 'Pi' or a 'Pp' or a 'Ps'
                  ],
-        "comp" => [['csubjpass', lambda { |x| x.head and x.head.passive? } ],
+        "comp" => [['csubj:pass', lambda { |x| x.head and x.head.passive? } ],
                    ['csubj', lambda { |x| x.head and x.head.copula? } ],
                    ['ccomp', lambda { |x| true } ],
                   ],
         "expl" => "expl",
         "narg" => [['acl', lambda(&:clausal?) ],
-                   ['nmod', lambda(&:nominal?) ],
+                   ['nmod', lambda(&:nominal?) ], 
                    ['nmod', lambda(&:adjectival?) ], # nominaliezed in this function
                    ['nmod', lambda { |x| true } ],
                   ],
         "nonsub" => "dep",
-        "obj" => "dobj",
-        "obl" => [["advmod", lambda { |x| x.adverb? or x.preposition? } ], # though normally a preposition will be subordinate to its noun
-                  ["iobj", lambda(&:nominal?) ],# if nominal (NB check for presence of article!)
+        "obj" => "obj:dir",
+        "obl" => [# normally a preposition will be subordinate to its noun, this captures adverbial use of prepositions
+                  ["advmod", lambda { |x| x.adverb? or x.preposition? } ], 
+                  ["obl", lambda { |x| x.has_preposition? } ],
+                  ["iobj", lambda(&:nominal?) ],# if nominal (NB check for presence of article!) TODO: should be "obj" if the verb is monovalent (even by elision)
                   ["iobj", lambda(&:adjectival?) ], # OBL adjectives are nominalized 
                   ["advcl", lambda(&:clausal?) ], # this seems to happen with ad libros legendos etc. but check closer!
-                  ["iobj", lambda { |x| true } ],
+                  ["iobj", lambda { |x| true } ], 
                  ],
         "parpred" => "parataxis",
         "part" => "nmod",
@@ -66,7 +73,7 @@ module PROIEL
                    ["ERROR", lambda { |x| raise "#{x.to_n} (head_id #{x.head_id}) is not a root!" }],
                   ],
         "rel" => "acl", # add :relcl?
-        "sub" => [["nsubjpass", lambda { |x| x.head and x.head.passive? } ],
+        "sub" => [["nsubj:pass", lambda { |x| x.head and x.head.passive? } ],
                   ["nsubj", lambda { |x| true }],
                  ],
         "voc" => "vocative",

data/lib/proiel/cli/version.rb

@@ -1,5 +1,5 @@
 module PROIEL
   module CLI
-    VERSION = '1.1.1'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proiel-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Marius L. Jøhndal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A command-line interface for working with PROIEL treebanks