dimus-biodiversity 0.0.18 → 0.5.1

data/lib/biodiversity/parser/scientific_name_dirty.treetop

@@ -1,98 +1,123 @@
-grammar ScientificNameDirty
-  include ScientificNameClean
- 
-  rule composite_scientific_name
-    super
-  end
-  
-# rule original_authors_names_full
-# super
-# end
-#
-# rule incorrect_original_authors_names
-# "[" space a:authors_names_full space "]" {
-# def value
-# "(" + a.value + ")"
-# end
-# def details
-# {:orig_authors => a.details[:authors]}
-# end
-# }
-# end
-  
-  rule year
-    a:[\d]+ space b:approximate_year {
-      def value
-        a.text_value + " " + b.text_value
-      end
-      def pos
-        {a.interval.begin => ['year', a.interval.end]}.merge(b.pos)
-      end
-      def details
-        {:ambiguous_year => value}
-      end
-    }
-    /
-    a:[\d]+ page_number
-    {
-      def value
-        a.text_value
-      end
-      
-      def pos
-        {a.interval.begin => ['year', a.interval.end]}
-      end
-      
-      def details
-        {:year => value}
-      end
-    }
-    /
-    double_year
-    /
-    approximate_year
-    /
-    super
-  end
-  
-  rule approximate_year
-    "[" space a:([\d] [\d] [\d] [\d\?]+) space "]"+ {
-      def value
-       "(" + a.text_value + ")"
-      end
-      
-      def pos
-        {a.interval.begin => ['year', a.interval.end]}
-      end
-      
-      def details
-        {:approximate_year => value}
-      end
-    }
-  end
-  
-  rule double_year
-    [0-9] [0-9A-Za-z\?\-]+ {
-      def value
-        text_value
-      end
-      
-      def pos
-        {interval.begin => ['year', interval.end]}
-      end
-      
-      def details
-        {:year => value}
-      end
-    }
-  end
-  
-  rule page_number
-    ":" space [\d]+
-    {
-      def value
-      end
-    }
-  end
-   
-end
+# encoding: UTF-8
+grammar ScientificNameDirty
+  include ScientificNameClean
+
+  rule root
+    super
+  end
+  
+  rule species
+    a:species_epitheton space b:year {
+       def value
+         a.value + " " + b.value
+       end
+     
+       def canonical
+         a.canonical
+       end
+     
+       def pos
+         a.pos.merge(b.pos)
+       end
+     
+       def details
+         {:species => a.details[:species].merge(b.details)}
+       end
+     }
+     /
+     super
+  end
+
+  rule right_paren
+   ")" space ")"
+   /
+   super
+  end
+    
+  
+  
+  rule left_paren
+   "(" space "("
+   /
+   super
+  end
+  
+  rule year
+    a:year_number space b:approximate_year {
+      def value
+        a.value + " " + b.value
+      end
+      
+      def pos
+        a.pos.merge(b.pos)
+      end
+      
+      def details
+        {:year => a.value, :approximate_year => b.value}
+      end
+    }
+    /
+    a:year_number space page_number {
+      def value
+        a.text_value
+      end
+      
+      def pos
+        {a.interval.begin => ['year', a.interval.end]}
+      end
+      
+      def details
+        {:year => value}
+      end
+    }
+    /
+    approximate_year
+    /
+    double_year
+    /
+    super
+  end
+  
+  rule approximate_year
+    "[" space a:year_number space "]"+ {
+      def value
+       "(" + a.text_value + ")"
+      end
+      
+      def pos
+        {a.interval.begin => ['year', a.interval.end]}
+      end
+      
+      def details
+        {:approximate_year => value}
+      end
+    }
+  end
+  
+  
+  rule double_year
+    year_number "-" [0-9]+ [A-Za-z]? [\?]? {
+      def value
+        text_value
+      end
+      
+      def pos
+        {interval.begin => ['year', interval.end]}
+      end
+      
+      def details
+        {:year => value}
+      end
+    }
+  end
+  
+  rule page_number
+    ":" space [\d]+
+    {
+      def value
+      end
+    }
+  end
+  
+  
+end

data/spec/parser/scientific_name.spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'rubygems'
 require 'spec'
 require 'treetop'
@@ -37,33 +36,13 @@ describe ScientificNameClean do
     parse(input).to_json
   end
   
-  it 'should parse accurate name' do
-    sn = 'Pseudocercospora     dendrobii'
-    parse(sn).should_not be_nil
-    value(sn).should == 'Pseudocercospora dendrobii'
-    canonical(sn).should == 'Pseudocercospora dendrobii'
-    details(sn).should == {:species=>"dendrobii", :genus=>"Pseudocercospora"}
-    pos(sn).should == {0=>["genus", 16], 21=>["species", 30]}
-    canonical('Quoyula').should == 'Quoyula'
-    parse('Perissandra laotica').should_not be_nil
-  end
-  
-  it 'should parse inaccurate name' do
-    parse("Tridentella tangeroae Bruce, 198?").should_not be_nil
-  end
-  
-  it 'should parse name that cannot be fully parsed' do
-    parse("Plantago major ESEFDSlj sdafsladjfasd fd ;asldfjasfas#&^&*^*^&}}").should_not be_nil
-    canonical('Plantago major ESEFDSlj sdafsladjfasd fd ;asldfjasfas#&^&*^*^&}}').should == 'Plantago major'
-  end
-  
-  it 'should generate pos_json output' do
-    parse("Plantago major").pos_to_json.should == '{"0":["genus",8],"9":["species",14]}'
-  end
-  
-  it 'should generate json output' do
-    parse("Stagonospora polyspora M.T. Lucas & Sousa da Câmara 1934").to_json.should == "{\"scientificName\":{\"parsed\":true,\"verbatim\":\"Stagonospora polyspora M.T. Lucas & Sousa da C\\u00e2mara 1934\",\"normalized\":\"Stagonospora polyspora M.T. Lucas et Sousa da C\\u00e2mara 1934\",\"canonical\":\"Stagonospora polyspora\",\"genus\":\"Stagonospora\",\"species\":\"polyspora\",\"authors\":{\"names\":[\"M.T. Lucas\",\"Sousa da C\\u00e2mara\"],\"year\":\"1934\"},\"name_part_verbatim\":\"Stagonospora polyspora\",\"auth_part_verbatim\":\"M.T. Lucas & Sousa da C\\u00e2mara 1934\"}}"
-    parse("something very wrong да?").to_json.should == "{\"parsed\":false,\"verbatim\":\"something very wrong \\u0434\\u0430?\"}"
+  it 'should generate standardized json' do
+    f = open(File.expand_path(dir + "../../spec/parser/test_data.txt"))
+    f.each do |line|
+      name, jsn, notes = line.split("|")
+      next unless line.match(/^\s*#/) == nil && name && jsn 
+      JSON.load(json(name)).should == JSON.load(jsn)
+    end
   end
 
 end

data/spec/parser/scientific_name_canonical.spec.rb

@@ -36,15 +36,16 @@ describe ScientificNameCanonical do
     
   it 'should parse names with valid name part and unparseable rest' do
     [
-      ['Moraea spathulata ( (L. f. Klatt','Moraea spathulata','Moraea spathulata',{:genus=>"Moraea", :species=>"spathulata", :name_part_verbatim=>"Moraea spathulata", :auth_part_verbatim=>"( (L. f. Klatt"}, {0=>["genus", 6], 7=>["species", 17]} ],
-      ['Verpericola megasoma ""Dall" Pils.','Verpericola megasoma','Verpericola megasoma',{:genus=>"Verpericola", :species=>"megasoma", :name_part_verbatim=>"Verpericola megasoma", :auth_part_verbatim=>"\"\"Dall\" Pils."}, {0=>["genus", 11], 12=>["species", 20]}],
-      ['Nesticus cellulanus affinis Kulczynski, in Chyzer & Kulczynski, 1894','Nesticus cellulanus affinis','Nesticus cellulanus affinis',{:genus=>"Nesticus", :species=>"cellulanus", :subspecies=>{:rank=>"n/a", :value=>"affinis"}, :name_part_verbatim=>"Nesticus cellulanus", :auth_part_verbatim=>"Kulczynski, in Chyzer & Kulczynski, 1894"},{0=>["genus", 8], 9=>["species", 19], 20=>["subspecies", 27]}]
+      ['Morea ssjjlajajaj324$33 234243242','Morea', {:uninomial=>{:epitheton=>"Morea"}}, {0=>["uninomial", 5]}],
+      ['Morea (Morea) Burt 2342343242 23424322342 23424234', 'Morea (Morea)', {:genus=>{:epitheton=>"Morea"}, :subgenus=>{:epitheton=>"Morea"}}, {0=>["genus", 5], 7=>["subgenus", 12]}],      
+      ['Morea (Morea) burtius 2342343242 23424322342 23424234', 'Morea (Morea) burtius', {:genus=>{:epitheton=>"Morea"}, :subgenus=>{:epitheton=>"Morea"}, :species=>{:epitheton=>"burtius"}}, {0=>["genus", 5], 7=>["subgenus", 12], 14=>["species", 21]}],
+      ['Moraea spathulata ( (L. f. Klatt','Moraea spathulata',{:genus=>{:epitheton=>"Moraea"}, :species=>{:epitheton=>"spathulata"}}, {0=>["genus", 6], 7=>["species", 17]} ],
+      ['Verpericola megasoma ""Dall" Pils.','Verpericola megasoma',{:genus=>{:epitheton=>"Verpericola"}, :species=>{:epitheton=>"megasoma"}}, {0=>["genus", 11], 12=>["species", 20]}] 
     ].each do |n|
       parse(n[0]).should_not be_nil
       value(n[0]).should == n[1]
-      canonical(n[0]).should == n[2]
-      details(n[0]).should == n[3]
-      pos(n[0]).should == n[4]
+      details(n[0]).should == n[2]
+      pos(n[0]).should == n[3]
     end
   end  
 end

data/spec/parser/scientific_name_clean.spec.rb

@@ -2,6 +2,7 @@
 dir = File.dirname("__FILE__")
 require 'rubygems'
 require 'spec'
+require 'yaml'
 require 'treetop'
 
 Treetop.load(File.expand_path(dir + '../../lib/biodiversity/parser/scientific_name_clean'))
@@ -36,57 +37,20 @@ describe ScientificNameClean do
     parse(sn).should_not be_nil
     value(sn).should == 'Pseudocercospora'
     canonical(sn).should == 'Pseudocercospora'
-    details(sn).should == {:uninomial=>"Pseudocercospora"}
+    details(sn).should == {:uninomial=>{:epitheton=>"Pseudocercospora"}}
     pos(sn).should == {0=>["uninomial", 16]}
   end
   
   it 'should parse uninomial with author and year' do
-    sn = 'Pseudocercospora Dow 1913'
+    sn = 'Pseudocercospora Speg.'
     parse(sn).should_not be_nil
-    value(sn).should == 'Pseudocercospora Dow 1913'
-    details(sn).should == {:authors=>{:year=>"1913", :names=>["Dow"]}, :name_part_verbatim=>"Pseudocercospora", :auth_part_verbatim=>"Dow 1913", :uninomial=>"Pseudocercospora"}
-    pos(sn).should == {0=>["uninomial", 16], 17=>["author_word", 20], 21=>["year", 25]}
-  end
-  
-  it 'should parse canonical' do
-    sn = 'Pseudocercospora     dendrobii'
-    parse(sn).should_not be_nil
-    value(sn).should == 'Pseudocercospora dendrobii'
-    canonical(sn).should == 'Pseudocercospora dendrobii'
-    details(sn).should == {:species=>"dendrobii", :genus=>"Pseudocercospora"}
-    pos(sn).should == {0=>["genus", 16], 21=>["species", 30]}
-  end
-  
-  it 'should parse subgenus ZOOLOGICAL' do
-    sn = "Doriteuthis (Amerigo) pealeii Author 1999"
+    details(sn).should == {:uninomial=>{:epitheton=>"Pseudocercospora", :authorship=>"Speg.", :basionymAuthorTeam=>{:authorTeam=>"Speg.", :author=>["Speg."]}}}
+    pos(sn).should == {0=>["uninomial", 16], 17=>["author_word", 22]}    
+    sn = 'Pseudocercospora Spegazzini, 1910'
     parse(sn).should_not be_nil
-    value(sn).should == "Doriteuthis (Amerigo) pealeii Author 1999"
-    canonical(sn).should == "Doriteuthis pealeii"
-    details(sn).should == {:genus=>"Doriteuthis", :subgenus=>"Amerigo", :species=>"pealeii", :authors=>{:names=>["Author"], :year=>"1999"}, :name_part_verbatim=>"Doriteuthis (Amerigo) pealeii", :auth_part_verbatim=>"Author 1999"}
-    pos(sn).should == {0=>["genus", 11], 13=>["subgenus", 20], 22=>["subspecies", 29], 30=>["author_word", 36], 37=>["year", 41]}
-  end
-  
-  it 'should parse æ in the name' do
-    names = [
-      ["Læptura laetifica Dow, 1913", "Laeptura laetifica Dow 1913"],
-      ["Leptura lætifica Dow, 1913", "Leptura laetifica Dow 1913"],
-      ["Leptura leætifica Dow, 1913", "Leptura leaetifica Dow 1913"],
-      ["Leæptura laetifica Dow, 1913", "Leaeptura laetifica Dow 1913"],
-      ["Leœptura laetifica Dow, 1913", "Leoeptura laetifica Dow 1913"],
-      ['Ærenea cognata Lacordaire, 1872', 'Aerenea cognata Lacordaire 1872'],
-      ['Œdicnemus capensis ehrenbergi', 'Oedicnemus capensis ehrenbergi'],
-      ['Œnanthe œnanthe œnanthe','Oenanthe oenanthe oenanthe']
-    ]
-    names.each do |name_pair|
-      parse(name_pair[0]).should_not be_nil
-      value(name_pair[0]).should == name_pair[1]
-    end
-  end
-  
-  it 'should parse names with "common" utf-8 charactes' do
-    names = ["Rühlella","Sténométope laevissimus Bibron 1855"].each do |name|
-      parse(name).should_not be_nil
-    end
+    value(sn).should == 'Pseudocercospora Spegazzini 1910'
+    details(sn).should == {:uninomial=>{:epitheton=>"Pseudocercospora", :authorship=>"Spegazzini, 1910", :basionymAuthorTeam=>{:authorTeam=>"Spegazzini", :author=>["Spegazzini"], :year=>"1910"}}}
+    pos(sn).should == {0=>["uninomial", 16], 17=>["author_word", 27], 29=>["year", 33]}
   end
   
   it 'should parse names with a valid 2 letter genus' do
@@ -103,7 +67,6 @@ describe ScientificNameClean do
     "Ty Bory de St. Vincent 1827",
     "Ua Girault 1929",
     "Aa Baker 1940",
-    #"Mc",
     "Ja Uéno 1955",
     "Zu Walters & Fitch 1960",
     "La Bleszynski 1966",
@@ -114,34 +77,86 @@ describe ScientificNameClean do
     end
     canonical('Quoyula').should == 'Quoyula'
   end
-
-  it 'should parse year' do
+  
+  it 'should parse canonical' do
+    sn = 'Pseudocercospora     dendrobii'
+    parse(sn).should_not be_nil
+    value(sn).should == 'Pseudocercospora dendrobii'
+    canonical(sn).should == 'Pseudocercospora dendrobii'
+    details(sn).should == {:genus=>{:epitheton=>"Pseudocercospora"}, :species=>{:epitheton=>"dendrobii"}}
+    pos(sn).should == {0=>["genus", 16], 21=>["species", 30]}
+  end
+  
+  
+  it 'should parse species name with author and year' do
     sn = "Platypus bicaudatulus Schedl 1935"
     parse(sn).should_not be_nil
     value(sn).should == "Platypus bicaudatulus Schedl 1935"
     sn = "Platypus bicaudatulus Schedl, 1935h"
     parse(sn).should_not be_nil
     value(sn).should == "Platypus bicaudatulus Schedl 1935"
-    details(sn).should == {:genus=>"Platypus", :species=>"bicaudatulus", :authors=>{:names=>["Schedl"], :year=>"1935"}, :name_part_verbatim=>"Platypus bicaudatulus", :auth_part_verbatim=>"Schedl, 1935h"}
+    details(sn).should == {:genus=>{:epitheton=>"Platypus"}, :species=>{:epitheton=>"bicaudatulus", :authorship=>"Schedl, 1935h", :basionymAuthorTeam=>{:authorTeam=>"Schedl", :author=>["Schedl"], :year=>"1935"}}}
     pos(sn).should == {0=>["genus", 8], 9=>["species", 21], 22=>["author_word", 28], 30=>["year", 35]}
     parse("Platypus bicaudatulus Schedl, 1935B").should_not be_nil
+    sn = "Platypus bicaudatulus Schedl (1935h)"
+    parse(sn).should_not be_nil
+    details(sn).should == {:genus=>{:epitheton=>"Platypus"}, :species=>{:epitheton=>"bicaudatulus", :authorship=>"Schedl (1935h)", :basionymAuthorTeam=>{:authorTeam=>"Schedl", :author=>["Schedl"], :year=>"1935"}}}
+    parse("Platypus bicaudatulus Schedl 1935").should_not be_nil
   end
   
-  it 'should parse species autonym for complex subspecies authorships' do
-    parse("Aus bus Linn. var. bus").should_not be_nil
-    details("Aus bus Linn. var. bus").should == {:genus=>"Aus", :species=>"bus", :subspecies=>[{:rank=>"var.", :value=>"bus"}], :species_authors=>{:authors=>{:names=>["Linn."]}}, :name_part_verbatim=>"Aus bus", :auth_part_verbatim=>"Linn. var. bus"}
-    sn = "Agalinis purpurea (L.) Briton var. borealis (Berg.) Peterson 1987"
+  it 'should parse genus with "?"' do
+    sn = "Ferganoconcha? oblonga"
     parse(sn).should_not be_nil
-    details(sn).should == {:genus=>"Agalinis", :species=>"purpurea", :subspecies=>[{:rank=>"var.", :value=>"borealis"}], :species_authors=>{:orig_authors=>{:names=>["L."]}, :authors=>{:names=>["Briton"]}}, :subspecies_authors=>{:orig_authors=>{:names=>["Berg."]}, :authors=>{:names=>["Peterson"], :year=>"1987"}}, :name_part_verbatim=>"Agalinis purpurea", :auth_part_verbatim=>"(L.) Briton var. borealis (Berg.) Peterson 1987"}
-    pos(sn).should == {0=>["genus", 8], 9=>["species", 17], 19=>["author_word", 21], 23=>["author_word", 29], 35=>["subspecies", 43], 45=>["author_word", 50], 52=>["author_word", 60], 61=>["year", 65]}
+    value(sn).should == "Ferganoconcha oblonga"
+    details(sn).should == {:genus=>{:epitheton=>"Ferganoconcha"}, :species=>{:epitheton=>"oblonga"}}
+    pos(sn).should == {0=>["genus", 14], 15=>["species", 22]}
   end
   
-  it 'should parse several authors' do
+  it 'should parse æ in the name' do
+    names = [
+      ["Læptura laetifica Dow, 1913", "Laeptura laetifica Dow 1913"],
+      ["Leptura lætifica Dow, 1913", "Leptura laetifica Dow 1913"],
+      ["Leptura leætifica Dow, 1913", "Leptura leaetifica Dow 1913"],
+      ["Leæptura laetifica Dow, 1913", "Leaeptura laetifica Dow 1913"],
+      ["Leœptura laetifica Dow, 1913", "Leoeptura laetifica Dow 1913"],
+      ['Ærenea cognata Lacordaire, 1872', 'Aerenea cognata Lacordaire 1872'],
+      ['Œdicnemus capensis', 'Oedicnemus capensis'],
+      ['Œnanthe œnanthe','Oenanthe oenanthe']
+    ]
+    names.each do |name_pair|
+      parse(name_pair[0]).should_not be_nil
+      value(name_pair[0]).should == name_pair[1]
+    end
+  end
+  
+  it 'should parse names with "common" utf-8 charactes' do
+    names = ["Rühlella","Sténométope laevissimus Bibron 1855"].each do |name|
+      parse(name).should_not be_nil
+    end
+    sn = "Trematosphaeria phaeospora (E. Müll.)         L.             Holm 1957"
+    parse(sn).should_not be_nil
+    value(sn).should == "Trematosphaeria phaeospora (E. Müll.) L. Holm 1957"
+    canonical(sn).should == "Trematosphaeria phaeospora"
+    details(sn).should == {:genus=>{:epitheton=>"Trematosphaeria"}, :species=>{:epitheton=>"phaeospora", :authorship=>"(E. Müll.)         L.             Holm 1957", :combinationAuthorTeam=>{:authorTeam=>"L.             Holm", :author=>["L. Holm"], :year=>"1957"}, :basionymAuthorTeam=>{:authorTeam=>"E. Müll.", :author=>["E. Müll."]}}}
+    pos(sn).should == {0=>["genus", 15], 16=>["species", 26], 28=>["author_word", 30], 31=>["author_word", 36], 46=>["author_word", 48], 61=>["author_word", 65], 66=>["year", 70]}
+    
+  end
+    
+  it 'should parse subgenus (ICZN code)' do
+    sn = "Hegeter (Hegeter) intercedens Lindberg H 1950"
+    parse(sn).should_not be_nil
+    value(sn).should == "Hegeter (Hegeter) intercedens Lindberg H 1950"
+    canonical(sn).should == "Hegeter intercedens"
+    details(sn).should == {:genus=>{:epitheton=>"Hegeter"}, :subgenus=>{:epitheton=>"Hegeter"}, :species=>{:epitheton=>"intercedens", :authorship=>"Lindberg H 1950", :basionymAuthorTeam=>{:authorTeam=>"Lindberg H", :author=>["Lindberg H"], :year=>"1950"}}}
+    pos(sn).should == {0=>["genus", 7], 9=>["subgenus", 16], 18=>["species", 29], 30=>["author_word", 38], 39=>["author_word", 40], 41=>["year", 45]}
+  end
+  
+  it 'should parse several authors without a year' do
     sn = "Pseudocercospora dendrobii U. Braun & Crous"
     parse(sn).should_not be_nil
     value(sn).should == "Pseudocercospora dendrobii U. Braun et Crous"
     canonical(sn).should == "Pseudocercospora dendrobii"
-    details(sn).should ==  {:genus=>"Pseudocercospora", :species=>"dendrobii", :authors=>{:names=>["U. Braun", "Crous"]}, :name_part_verbatim=>"Pseudocercospora dendrobii", :auth_part_verbatim=>"U. Braun & Crous"}
+    details(sn).should ==  {:genus=>{:epitheton=>"Pseudocercospora"}, :species=>{:epitheton=>"dendrobii", :authorship=>"U. Braun & Crous", :basionymAuthorTeam=>{:authorTeam=>"U. Braun & Crous", :author=>["U. Braun", "Crous"]}}}
     pos(sn).should == {0=>["genus", 16], 17=>["species", 26], 27=>["author_word", 29], 30=>["author_word", 35], 38=>["author_word", 43]}
     sn = "Pseudocercospora dendrobii U. Braun and Crous"
     parse(sn).should_not be_nil
@@ -150,46 +165,120 @@ describe ScientificNameClean do
     sn = "Pseudocercospora dendrobii U. Braun et Crous"
     parse(sn).should_not be_nil
     value(sn).should == "Pseudocercospora dendrobii U. Braun et Crous"    
+    sn = "Arthopyrenia hyalospora(Nyl.)R.C.     Harris"
+    parse(sn).should_not be_nil
+    value(sn).should == "Arthopyrenia hyalospora (Nyl.) R.C. Harris"
+    canonical(sn).should == "Arthopyrenia hyalospora"
+    details(sn).should == {:genus=>{:epitheton=>"Arthopyrenia"}, :species=>{:epitheton=>"hyalospora", :authorship=>"(Nyl.)R.C.     Harris", :combinationAuthorTeam=>{:authorTeam=>"R.C.     Harris", :author=>["R.C. Harris"]}, :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."]}}}
   end
+  
+  
 
   it 'should parse several authors with a year' do
     sn = "Pseudocercospora dendrobii U. Braun & Crous 2003"
     parse(sn).should_not be_nil
     value(sn).should == "Pseudocercospora dendrobii U. Braun et Crous 2003"
     canonical(sn).should == "Pseudocercospora dendrobii"
-    details(sn).should == {:genus=>"Pseudocercospora", :species=>"dendrobii", :authors=>{:names=>["U. Braun", "Crous"], :year=>"2003"}, :name_part_verbatim=>"Pseudocercospora dendrobii", :auth_part_verbatim=>"U. Braun & Crous 2003"}
+    details(sn).should == {:genus=>{:epitheton=>"Pseudocercospora"}, :species=>{:epitheton=>"dendrobii", :authorship=>"U. Braun & Crous 2003", :basionymAuthorTeam=>{:authorTeam=>"U. Braun & Crous", :author=>["U. Braun", "Crous"], :year=>"2003"}}}
     pos(sn).should == {0=>["genus", 16], 17=>["species", 26], 27=>["author_word", 29], 30=>["author_word", 35], 38=>["author_word", 43], 44=>["year", 48]}
     sn = "Pseudocercospora dendrobii Crous, 2003"
     parse(sn).should_not be_nil
-    parse("Zophosis persis (Chatanay, 1914)").should_not be_nil
-    parse("Zophosis persis (Chatanay 1914)").should_not be_nil
+  end
+  
+  it 'should parse basionym authors in parenthesis' do
+    sn = "Zophosis persis (Chatanay, 1914)"
+    parse(sn).should_not be_nil
+    details(sn).should == {:genus=>{:epitheton=>"Zophosis"}, :species=>{:epitheton=>"persis", :authorship=>"(Chatanay, 1914)", :basionymAuthorTeam=>{:authorTeam=>"Chatanay", :author=>["Chatanay"], :year=>"1914"}}}
+    sn = "Zophosis persis (Chatanay 1914)"
+    parse(sn).should_not be_nil
+    details(sn).should == {:genus=>{:epitheton=>"Zophosis"}, :species=>{:epitheton=>"persis", :authorship=>"(Chatanay 1914)", :basionymAuthorTeam=>{:authorTeam=>"Chatanay", :author=>["Chatanay"], :year=>"1914"}}}
     sn = "Zophosis persis (Chatanay), 1914"
     parse(sn).should_not be_nil
     value(sn).should == "Zophosis persis (Chatanay 1914)"
-    details(sn).should == {:genus=>"Zophosis", :species=>"persis", :orig_authors=>{:names=>["Chatanay"]}, :year=>"1914", :name_part_verbatim=>"Zophosis persis", :auth_part_verbatim=>"(Chatanay), 1914"}
+    details(sn).should == {:genus=>{:epitheton=>"Zophosis"}, :species=>{:epitheton=>"persis", :authorship=>"(Chatanay), 1914", :basionymAuthorTeam=>{:author_team=>"(Chatanay), 1914", :author=>["Chatanay"], :year=>"1914"}}}
     pos(sn).should == {0=>["genus", 8], 9=>["species", 15], 17=>["author_word", 25], 28=>["year", 32]}
     parse("Zophosis persis (Chatanay) 1914").should_not be_nil
     #parse("Zophosis persis Chatanay (1914)").should_not be_nil
   end  
   
   it 'should parse scientific name' do
-    sn = "Abacetus laevicollis de Chaudoir, 1869"
+    sn = "Pseudocercospora dendrobii(H.C.     Burnett)U. Braun & Crous     2003"
     parse(sn).should_not be_nil
-    canonical(sn).should == 'Abacetus laevicollis'
-    parse("Pseudocercospora dendrobii (H.C. Burnett) U. Braun & Crous 2003").should_not be_nil
-    value("Pseudocercospora dendrobii(H.C.     Burnett)U. Braun & Crous     2003").should == "Pseudocercospora dendrobii (H.C. Burnett) U. Braun et Crous 2003"
-    canonical("Pseudocercospora dendrobii(H.C.     Burnett)U. Braun & Crous     2003").should == "Pseudocercospora dendrobii"
+    value(sn).should == "Pseudocercospora dendrobii (H.C. Burnett) U. Braun et Crous 2003"
+    canonical(sn).should == "Pseudocercospora dendrobii"
+    details(sn).should == {:genus=>{:epitheton=>"Pseudocercospora"}, :species=>{:epitheton=>"dendrobii", :authorship=>"(H.C.     Burnett)U. Braun & Crous     2003", :combinationAuthorTeam=>{:authorTeam=>"U. Braun & Crous", :author=>["U. Braun", "Crous"], :year=>"2003"}, :basionymAuthorTeam=>{:authorTeam=>"H.C.     Burnett", :author=>["H.C. Burnett"]}}}
+    sn = "Pseudocercospora dendrobii(H.C.     Burnett,1873)U. Braun & Crous     2003"
+    parse(sn).should_not be_nil
+    value(sn).should == "Pseudocercospora dendrobii (H.C. Burnett 1873) U. Braun et Crous 2003"
+    details(sn).should == {:genus=>{:epitheton=>"Pseudocercospora"}, :species=>{:epitheton=>"dendrobii", :authorship=>"(H.C.     Burnett,1873)U. Braun & Crous     2003", :combinationAuthorTeam=>{:authorTeam=>"U. Braun & Crous", :author=>["U. Braun", "Crous"], :year=>"2003"}, :basionymAuthorTeam=>{:authorTeam=>"H.C.     Burnett", :author=>["H.C. Burnett"], :year=>"1873"}}}
+  end
+  
+  it 'should parse several authors with several years' do
+    sn = "Pseudocercospora dendrobii (H.C. Burnett 1883) U. Braun & Crous 2003"
+    parse(sn).should_not be_nil
+    value(sn).should == "Pseudocercospora dendrobii (H.C. Burnett 1883) U. Braun et Crous 2003"
+    canonical(sn).should == "Pseudocercospora dendrobii"
+    details(sn).should == {:genus=>{:epitheton=>"Pseudocercospora"}, :species=>{:epitheton=>"dendrobii", :authorship=>"(H.C. Burnett 1883) U. Braun & Crous 2003", :combinationAuthorTeam=>{:authorTeam=>"U. Braun & Crous", :author=>["U. Braun", "Crous"], :year=>"2003"}, :basionymAuthorTeam=>{:authorTeam=>"H.C. Burnett", :author=>["H.C. Burnett"], :year=>"1883"}}}
+    pos(sn).should == {0=>["genus", 16], 17=>["species", 26], 28=>["author_word", 32], 33=>["author_word", 40], 41=>["year", 45], 47=>["author_word", 49], 50=>["author_word", 55], 58=>["author_word", 63], 64=>["year", 68]}
+  end
+
+  it "should parse name with subspecies without rank Zoological Code" do
+    sn = "Hydnellum scrobiculatum zonatum (Banker) D. Hall & D.E. Stuntz 1972"
+    parse(sn).should_not be_nil
+    value(sn).should == "Hydnellum scrobiculatum zonatum (Banker) D. Hall et D.E. Stuntz 1972"
+    canonical(sn).should == "Hydnellum scrobiculatum zonatum"
+    details(sn).should == {:genus=>{:epitheton=>"Hydnellum"}, :species=>{:epitheton=>"scrobiculatum"}, :infraspecies=>{:epitheton=>"zonatum", :rank=>"n/a", :authorship=>"(Banker) D. Hall & D.E. Stuntz 1972", :combinationAuthorTeam=>{:authorTeam=>"D. Hall & D.E. Stuntz", :author=>["D. Hall", "D.E. Stuntz"], :year=>"1972"}, :basionymAuthorTeam=>{:authorTeam=>"Banker", :author=>["Banker"]}}}
+    pos(sn).should == {0=>["genus", 9], 10=>["species", 23], 24=>["infraspecies", 31], 33=>["author_word", 39], 41=>["author_word", 43], 44=>["author_word", 48], 51=>["author_word", 55], 56=>["author_word", 62], 63=>["year", 67]}
+    sn = "Begonia pingbienensis angustior"
+    parse(sn).should_not be_nil
+    details(sn).should == {:genus=>{:epitheton=>"Begonia"}, :species=>{:epitheton=>"pingbienensis"}, :infraspecies=>{:epitheton=>"angustior", :rank=>"n/a"}}
+    pos(sn).should == {0=>["genus", 7], 8=>["species", 21], 22=>["infraspecies", 31]}
+  end
 
+  it 'should parse infraspecies with rank' do
+    sn = "Aus bus Linn. var. bus"
+    parse(sn).should_not be_nil
+    details(sn).should == {:genus=>{:epitheton=>"Aus"}, :species=>{:epitheton=>"bus", :authorship=>"Linn.", :basionymAuthorTeam=>{:authorTeam=>"Linn.", :author=>["Linn."]}}, :infraspecies=>{:epitheton=>"bus", :rank=>"var."}}
+    sn = "Agalinis purpurea (L.) Briton var. borealis (Berg.) Peterson 1987"
+    parse(sn).should_not be_nil
+    details(sn).should == {:genus=>{:epitheton=>"Agalinis"}, :species=>{:epitheton=>"purpurea", :authorship=>"(L.) Briton", :combinationAuthorTeam=>{:authorTeam=>"Briton", :author=>["Briton"]}, :basionymAuthorTeam=>{:authorTeam=>"L.", :author=>["L."]}}, :infraspecies=>{:epitheton=>"borealis", :rank=>"var.", :authorship=>"(Berg.) Peterson 1987", :combinationAuthorTeam=>{:authorTeam=>"Peterson", :author=>["Peterson"], :year=>"1987"}, :basionymAuthorTeam=>{:authorTeam=>"Berg.", :author=>["Berg."]}}}
+    pos(sn).should == {0=>["genus", 8], 9=>["species", 17], 19=>["author_word", 21], 23=>["author_word", 29], 35=>["infraspecies", 43], 45=>["author_word", 50], 52=>["author_word", 60], 61=>["year", 65]}
+    sn = "Phaeographis inusta var. macularis(Leight.) A.L. Sm. 1861"
+    parse(sn).should_not be_nil
+    value(sn).should == "Phaeographis inusta var. macularis (Leight.) A.L. Sm. 1861"
+    canonical(sn).should == "Phaeographis inusta macularis"
+    pos(sn).should == {0=>["genus", 12], 13=>["species", 19], 25=>["infraspecies", 34], 35=>["author_word", 42], 44=>["author_word", 48], 49=>["author_word", 52], 53=>["year", 57]}
+  end
+
+  it 'should parse unknown original authors (auct.)/(hort.)/(?)' do
+    sn = "Tragacantha leporina (?) Kuntze"
+    parse(sn).should_not be_nil
+    value(sn).should == "Tragacantha leporina (?) Kuntze"
+    details(sn).should == {:genus=>{:epitheton=>"Tragacantha"}, :species=>{:epitheton=>"leporina", :authorship=>"(?) Kuntze", :combinationAuthorTeam=>{:authorTeam=>"Kuntze", :author=>["Kuntze"]}, :basionymAuthorTeam=>{:authorTeam=>"(?)", :author=>["?"]}}}
+    sn = "Lachenalia tricolor var. nelsonii (auct.) Baker"
+    parse(sn).should_not be_nil
+    value(sn).should == "Lachenalia tricolor var. nelsonii (auct.) Baker"
+    details(sn).should == {:genus=>{:epitheton=>"Lachenalia"}, :species=>{:epitheton=>"tricolor"}, :infraspecies=>{:epitheton=>"nelsonii", :rank=>"var.", :authorship=>"(auct.) Baker", :combinationAuthorTeam=>{:authorTeam=>"Baker", :author=>["Baker"]}, :basionymAuthorTeam=>{:authorTeam=>"auct.", :author=>["unknown"]}}}
+    pos(sn).should == {0=>["genus", 10], 11=>["species", 19], 25=>["infraspecies", 33], 35=>["unknown_author", 40], 42=>["author_word", 47]}
+  end  
+  
+  it 'should parse unknown authors auct./anon./hort./ht.' do
+    sn = "Puya acris ht."
+    parse(sn).should_not be_nil
+    pos(sn).should == {0=>["genus", 4], 5=>["species", 10], 11=>["unknown_author", 14]}
+  end
+  
+  it 'shuould parse real world examples' do
     sn = "Stagonospora polyspora M.T. Lucas & Sousa da Câmara 1934"
     parse(sn).should_not be_nil
     value(sn).should == "Stagonospora polyspora M.T. Lucas et Sousa da Câmara 1934"
-    details(sn).should == {:genus=>"Stagonospora", :species=>"polyspora", :authors=>{:names=>["M.T. Lucas", "Sousa da Câmara"], :year=>"1934"}, :name_part_verbatim=>"Stagonospora polyspora", :auth_part_verbatim=>"M.T. Lucas & Sousa da Câmara 1934"}
+    details(sn).should == {:genus=>{:epitheton=>"Stagonospora"}, :species=>{:epitheton=>"polyspora", :authorship=>"M.T. Lucas & Sousa da Câmara 1934", :basionymAuthorTeam=>{:authorTeam=>"M.T. Lucas & Sousa da Câmara", :author=>["M.T. Lucas", "Sousa da Câmara"], :year=>"1934"}}}
     pos(sn).should == {0=>["genus", 12], 13=>["species", 22], 23=>["author_word", 27], 28=>["author_word", 33], 36=>["author_word", 41], 42=>["author_word", 44], 45=>["author_word", 51], 52=>["year", 56]}
     parse("Cladoniicola staurospora Diederich, van den Boom & Aptroot 2001").should_not be_nil
     sn = "Yarrowia lipolytica var. lipolytica (Wick., Kurtzman & E.A. Herrm.) Van der Walt & Arx 1981"
     parse(sn).should_not be_nil
     value(sn).should == "Yarrowia lipolytica var. lipolytica (Wick., Kurtzman et E.A. Herrm.) Van der Walt et Arx 1981"
-    pos(sn).should == {0=>["genus", 8], 9=>["species", 19], 25=>["subspecies", 35], 37=>["author_word", 42], 44=>["author_word", 52], 55=>["author_word", 59], 60=>["author_word", 66], 68=>["author_word", 71], 72=>["author_word", 75], 76=>["author_word", 80], 83=>["author_word", 86], 87=>["year", 91]}
+    pos(sn).should == {0=>["genus", 8], 9=>["species", 19], 25=>["infraspecies", 35], 37=>["author_word", 42], 44=>["author_word", 52], 55=>["author_word", 59], 60=>["author_word", 66], 68=>["author_word", 71], 72=>["author_word", 75], 76=>["author_word", 80], 83=>["author_word", 86], 87=>["year", 91]}
     parse("Physalospora rubiginosa (Fr.) anon.").should_not be_nil
     parse("Pleurotus ëous (Berk.) Sacc. 1887").should_not be_nil
     parse("Lecanora wetmorei Śliwa 2004").should_not be_nil
@@ -206,293 +295,200 @@ describe ScientificNameClean do
     #   author is exception
     sn = "Tuber liui A S. Xu 1999"
     parse(sn).should_not be_nil
-    details(sn).should == {:genus=>"Tuber", :species=>"liui", :authors=>{:names=>["A S. Xu"], :year=>"1999"}, :name_part_verbatim=>"Tuber liui", :auth_part_verbatim=>"A S. Xu 1999"}
-    pos(sn).should == {0=>["genus", 5], 6=>["species", 10], 11=>["author_word", 1], 13=>["author_word", 2], 16=>["author_word", 2], 19=>["year", 23]}
+    details(sn).should == {:genus=>{:epitheton=>"Tuber"}, :species=>{:epitheton=>"liui", :authorship=>"A S. Xu 1999", :basionymAuthorTeam=>{:authorTeam=>"A S. Xu", :author=>["A S. Xu"], :year=>"1999"}}}
     parse('Xylaria potentillae A S. Xu').should_not be_nil
     parse("Agaricus squamula Berk. & M.A. Curtis 1860").should_not be_nil
     parse("Peltula coriacea Büdel, Henssen & Wessels 1986").should_not be_nil
     #had to add no dot rule for trinomials without a rank to make it to work
     sn = "Saccharomyces drosophilae anon."
     parse(sn).should_not be_nil
-    details(sn).should == {:genus=>"Saccharomyces", :species=>"drosophilae", :authors=>{:names=>["anon."]}, :name_part_verbatim=>"Saccharomyces drosophilae", :auth_part_verbatim=>"anon."}
-    pos(sn).should == {0=>["genus", 13], 14=>["species", 25], 26=>["author_word", 31]}
-  end
-  
-  it 'should parse several authors with several years' do
-    sn = "Pseudocercospora dendrobii (H.C. Burnett 1883) U. Braun & Crous 2003"
-    parse(sn).should_not be_nil
-    value(sn).should == "Pseudocercospora dendrobii (H.C. Burnett 1883) U. Braun et Crous 2003"
-    canonical(sn).should == "Pseudocercospora dendrobii"
-    details(sn).should == {:genus=>"Pseudocercospora", :species=>"dendrobii", :orig_authors=>{:names=>["H.C. Burnett"], :year=>"1883"}, :authors=>{:names=>["U. Braun", "Crous"], :year=>"2003"}, :name_part_verbatim=>"Pseudocercospora dendrobii", :auth_part_verbatim=>"(H.C. Burnett 1883) U. Braun & Crous 2003"}
-    pos(sn).should == {0=>["genus", 16], 17=>["species", 26], 28=>["author_word", 32], 33=>["author_word", 40], 41=>["year", 45], 47=>["author_word", 49], 50=>["author_word", 55], 58=>["author_word", 63], 64=>["year", 68]}
-  end
-  
-  it 'should parse unknown original authors (auct.)/(hort.)/(?)' do
-    parse("Tragacantha leporina (?) Kuntze").should_not be_nil
-    value("Tragacantha    leporina (    ?      )       Kuntze").should == "Tragacantha leporina (?) Kuntze"
-    sn = "Lachenalia tricolor var. nelsonii (auct.) Baker"
-    parse(sn).should_not be_nil
-    value(sn).should == "Lachenalia tricolor var. nelsonii (auct.) Baker"
-    details(sn).should == {:genus=>"Lachenalia", :species=>"tricolor", :subspecies=>[{:rank=>"var.", :value=>"nelsonii"}], :orig_authors=>"unknown", :authors=>{:names=>["Baker"]}, :name_part_verbatim=>"Lachenalia tricolor var. nelsonii", :auth_part_verbatim=>"(auct.) Baker"}
-    pos(sn).should == {0=>["genus", 10], 11=>["species", 19], 25=>["subspecies", 33], 35=>["unknown_author", 40], 42=>["author_word", 47]}
-  end
-  
-  it 'should parse unknown authors auct./anon./hort./ht.' do
-    sn = "Puya acris ht. ex Gentil"
-    parse(sn).should_not be_nil
-    pos(sn).should == {0=>["genus", 4], 5=>["species", 10], 11=>["unknown_author", 14], 18=>["author_word", 24]}
-  end
-  
-
-  it 'should not parse serveral authors groups with several years NOT CORRECT' do
-    parse("Pseudocercospora dendrobii (H.C. Burnett 1883) (Leight.) (Movss. 1967) U. Braun & Crous 2003").should be_nil
-  end
-  
-  it 'should parse names with taxon concept sec. part' do
-    sn = "Sténométope laevissimus sec. Eschmeyer 2004"
-    parse(sn).should_not be_nil
-    details(sn).should == {:genus=>"Sténométope", :species=>"laevissimus", :taxon_concept=>{:authors=>{:names=>["Eschmeyer"], :year=>"2004"}}, :name_part_verbatim=>"Sténométope laevissimus", :auth_part_verbatim=>"sec. Eschmeyer 2004"}
-    pos(sn).should == {0=>["genus", 11], 12=>["species", 23], 29=>["author_word", 38], 39=>["year", 43]}
-    sn = "Sténométope laevissimus Bibron 1855 sec. Eschmeyer 2004"
+    details(sn).should == {:genus=>{:epitheton=>"Saccharomyces"}, :species=>{:epitheton=>"drosophilae", :authorship=>"anon.", :basionymAuthorTeam=>{:authorTeam=>"anon.", :author=>["unknown"]}}}
+    pos(sn).should == {0=>["genus", 13], 14=>["species", 25], 26=>["unknown_author", 31]}
+    sn = "Abacetus laevicollis de Chaudoir, 1869"
     parse(sn).should_not be_nil
-    details(sn).should == {:genus=>"Sténométope", :species=>"laevissimus", :authors=>{:names=>["Bibron"], :year=>"1855"}, :taxon_concept=>{:authors=>{:names=>["Eschmeyer"], :year=>"2004"}}, :name_part_verbatim=>"Sténométope laevissimus", :auth_part_verbatim=>"Bibron 1855 sec. Eschmeyer 2004"}
-    pos(sn).should == {0=>["genus", 11], 12=>["species", 23], 24=>["author_word", 30], 31=>["year", 35], 41=>["author_word", 50], 51=>["year", 55]}
-    # 
-    # puts "<pre>"
-    # puts @parser.failure_reason
-    # #puts @parser.public_methods.select{|r| r.match /fail/}
-    # puts "</pre>"
+    canonical(sn).should == 'Abacetus laevicollis'
+    sn = "Gastrosericus eremorum van Beaumont 1955"
+    canonical(sn).should == 'Gastrosericus eremorum'
+    sn = "Gastrosericus eremorum von Beaumont 1955"
+    canonical(sn).should == 'Gastrosericus eremorum'
+    sn = "Cypraeovula (Luponia) amphithales perdentata"
+    canonical(sn).should == 'Cypraeovula amphithales perdentata'
+    details(sn).should == {:genus=>{:epitheton=>"Cypraeovula"}, :subgenus=>{:epitheton=>"Luponia"}, :species=>{:epitheton=>"amphithales"}, :infraspecies=>{:epitheton=>"perdentata", :rank=>"n/a"}}
+    sn = "Polyrhachis orsyllus nat musculus Forel 1901"
+    canonical(sn).should == "Polyrhachis orsyllus musculus"
+    sn = 'Latrodectus 13-guttatus Thorell, 1875'
+    canonical(sn).should == 'Latrodectus 13-guttatus'
+    value(sn).should == 'Latrodectus 13-guttatus Thorell 1875'
+    sn = 'Latrodectus 3guttatus Thorell, 1875'
+    canonical(sn).should == 'Latrodectus 3-guttatus'
+    value(sn).should == 'Latrodectus 3-guttatus Thorell 1875'
   end
 
-    
-  it 'should parse utf-8 name' do
-    sn = "Trematosphaeria phaeospora (E. Müll.)         L.             Holm 1957"
+  it "should parse name with morph." do
+    sn = "Callideriphus flavicollis morph. reductus Fuchs 1961"
     parse(sn).should_not be_nil
-    value(sn).should == "Trematosphaeria phaeospora (E. Müll.) L. Holm 1957"
-    canonical(sn).should == "Trematosphaeria phaeospora"
-    details(sn).should == {:genus=>"Trematosphaeria", :species=>"phaeospora", :orig_authors=>{:names=>["E. Müll."]}, :authors=>{:names=>["L. Holm"], :year=>"1957"}, :name_part_verbatim=>"Trematosphaeria phaeospora", :auth_part_verbatim=>"(E. Müll.) L. Holm 1957"}
-    pos(sn).should == {0=>["genus", 15], 16=>["species", 26], 28=>["author_word", 30], 31=>["author_word", 36], 46=>["author_word", 48], 61=>["author_word", 65], 66=>["year", 70]}
+    value(sn).should == "Callideriphus flavicollis morph. reductus Fuchs 1961"
+    canonical(sn).should == "Callideriphus flavicollis reductus"
+    details(sn).should == {:genus=>{:epitheton=>"Callideriphus"}, :species=>{:epitheton=>"flavicollis"}, :infraspecies=>{:epitheton=>"reductus", :rank=>"morph.", :authorship=>"Fuchs 1961", :basionymAuthorTeam=>{:authorTeam=>"Fuchs", :author=>["Fuchs"], :year=>"1961"}}}
+    pos(sn).should == {0=>["genus", 13], 14=>["species", 25], 33=>["infraspecies", 41], 42=>["author_word", 47], 48=>["year", 52]}
   end
-  
-  it "should parse name with var." do
-    sn = "Phaeographis inusta var. macularis(Leight.) A.L. Sm. 1861"
-    parse(sn).should_not be_nil
-    value(sn).should == "Phaeographis inusta var. macularis (Leight.) A.L. Sm. 1861"
-    canonical(sn).should == "Phaeographis inusta macularis"
-    pos(sn).should == {0=>["genus", 12], 13=>["species", 19], 25=>["subspecies", 34], 35=>["author_word", 42], 44=>["author_word", 48], 49=>["author_word", 52], 53=>["year", 57]}
-  end
-  
-it "should parse name with morph." do
-  sn = "Callideriphus flavicollis morph. reductus Fuchs 1961"
-  parse(sn).should_not be_nil
-  value(sn).should == "Callideriphus flavicollis morph. reductus Fuchs 1961"
-  canonical(sn).should == "Callideriphus flavicollis reductus"
-  details(sn).should == {:genus=>"Callideriphus", :species=>"flavicollis", :subspecies=>[{:rank=>"morph.", :value=>"reductus"}], :authors=>{:names=>["Fuchs"], :year=>"1961"}, :name_part_verbatim=>"Callideriphus flavicollis morph. reductus", :auth_part_verbatim=>"Fuchs 1961"}
-  pos(sn).should == {0=>["genus", 13], 14=>["species", 25], 33=>["subspecies", 41], 42=>["author_word", 47], 48=>["year", 52]}
-end
-
-#  "subsect."/"subtrib."/"subgen."/"trib."/
-#Stipa Speg. subgen. Leptostipa
-#Sporobolus subgen. Sporobolus R.Br.
 
-# it 'should parse name with "subsect."/"subtrib."/"subgen."/"trib."' do
-#   val = "Sporobolus subgen. Sporobolus R.Br."
-#   parse(val).should_not be_nil
-#   # value(val).should == val
-#   # canonical(val).should == "Callideriphus flavicollis reductus"
-#   # details(val).should == {}
-# end
   
   it "should parse name with forma/fo./form./f." do
     sn = "Caulerpa cupressoides forma nuda"
     parse(sn).should_not be_nil
     value(sn).should == "Caulerpa cupressoides f. nuda"
     canonical(sn).should == "Caulerpa cupressoides nuda"
-    details(sn).should == {:genus=>"Caulerpa", :species=>"cupressoides", :subspecies=>[{:rank=>"f.", :value=>"nuda"}]}
-    pos(sn).should == {0=>["genus", 8], 9=>["species", 21], 28=>["subspecies", 32]} 
+    details(sn).should == {:genus=>{:epitheton=>"Caulerpa"}, :species=>{:epitheton=>"cupressoides"}, :infraspecies=>{:epitheton=>"nuda", :rank=>"f."}}
+    pos(sn).should == {0=>["genus", 8], 9=>["species", 21], 28=>["infraspecies", 32]}
     sn = "Chlorocyperus glaber form. fasciculariforme (Lojac.) Soó"
     parse(sn).should_not be_nil
     value("Chlorocyperus glaber form. fasciculariforme (Lojac.) Soó").should == "Chlorocyperus glaber f. fasciculariforme (Lojac.) Soó"
     canonical(sn).should == "Chlorocyperus glaber fasciculariforme"
-    details(sn).should == {:genus=>"Chlorocyperus", :species=>"glaber", :subspecies=>[{:rank=>"f.", :value=>"fasciculariforme"}], :orig_authors=>{:names=>["Lojac."]}, :authors=>{:names=>["Soó"]}, :name_part_verbatim=>"Chlorocyperus glaber form. fasciculariforme", :auth_part_verbatim=>"(Lojac.) Soó"}
-    pos(sn).should == {0=>["genus", 13], 14=>["species", 20], 27=>["subspecies", 43], 45=>["author_word", 51], 53=>["author_word", 56]}
+    details(sn).should == {:genus=>{:epitheton=>"Chlorocyperus"}, :species=>{:epitheton=>"glaber"}, :infraspecies=>{:epitheton=>"fasciculariforme", :rank=>"f.", :authorship=>"(Lojac.) Soó", :combinationAuthorTeam=>{:authorTeam=>"Soó", :author=>["Soó"]}, :basionymAuthorTeam=>{:authorTeam=>"Lojac.", :author=>["Lojac."]}}}
+    pos(sn).should == {0=>["genus", 13], 14=>["species", 20], 27=>["infraspecies", 43], 45=>["author_word", 51], 53=>["author_word", 56]}
     sn = "Bambusa nana Roxb. fo. alphonse-karri (Mitford ex Satow) Makino ex Shiros."
     parse(sn).should_not be_nil
     value(sn).should == "Bambusa nana Roxb. f. alphonse-karri (Mitford ex Satow) Makino ex Shiros."
     canonical(sn).should == "Bambusa nana alphonse-karri"
-    details(sn).should == {:genus=>"Bambusa", :species=>"nana", :subspecies=>[{:rank=>"f.", :value=>"alphonse-karri"}], :species_authors=>{:authors=>{:names=>["Roxb."]}}, :subspecies_authors=>{:original_revised_name_authors=>{:revised_authors=>{:names=>["Mitford"]}, :authors=>{:names=>["Satow"]}}, :revised_name_authors=>{:revised_authors=>{:names=>["Makino"]}, :authors=>{:names=>["Shiros."]}}}, :name_part_verbatim=>"Bambusa nana", :auth_part_verbatim=>"Roxb. fo. alphonse-karri (Mitford ex Satow) Makino ex Shiros."}
-    pos(sn).should ==  {0=>["genus", 7], 8=>["species", 12], 13=>["author_word", 18], 23=>["subspecies", 37], 39=>["author_word", 46], 50=>["author_word", 55], 57=>["author_word", 63], 67=>["author_word", 74]}
+    details(sn).should == {:genus=>{:epitheton=>"Bambusa"}, :species=>{:epitheton=>"nana", :authorship=>"Roxb.", :basionymAuthorTeam=>{:authorTeam=>"Roxb.", :author=>["Roxb."]}}, :infraspecies=>{:epitheton=>"alphonse-karri", :rank=>"f.", :authorship=>"(Mitford ex Satow) Makino ex Shiros.", :combinationAuthorTeam=>{:authorTeam=>"Makino", :author=>["Makino"], :exAuthorTeam=>{:authorTeam=>"Shiros.", :author=>["Shiros."]}}, :basionymAuthorTeam=>{:authorTeam=>"Mitford", :author=>["Mitford"], :exAuthorTeam=>{:authorTeam=>"Satow", :author=>["Satow"]}}}}
+    pos(sn).should ==  {0=>["genus", 7], 8=>["species", 12], 13=>["author_word", 18], 23=>["infraspecies", 37], 39=>["author_word", 46], 50=>["author_word", 55], 57=>["author_word", 63], 67=>["author_word", 74]}
     sn = "   Sphaerotheca    fuliginea     f.    dahliae    Movss.   1967    "
+    sn = "Sphaerotheca    fuliginea    f.     dahliae    Movss.     1967"
     parse(sn).should_not be_nil
     value(sn).should == "Sphaerotheca fuliginea f. dahliae Movss. 1967"
     canonical(sn).should == "Sphaerotheca fuliginea dahliae"
-    details(sn).should ==  {:genus=>"Sphaerotheca", :species=>"fuliginea", :subspecies=>[{:rank=>"f.", :value=>"dahliae"}], :authors=>{:names=>["Movss."], :year=>"1967"}, :name_part_verbatim=>"Sphaerotheca    fuliginea     f.    dahliae", :auth_part_verbatim=>"Movss. 1967"}
-    pos(sn).should == {3=>["genus", 15], 19=>["species", 28], 39=>["subspecies", 46], 50=>["author_word", 56], 59=>["year", 63]}
+    details(sn).should ==  {:genus=>{:epitheton=>"Sphaerotheca"}, :species=>{:epitheton=>"fuliginea"}, :infraspecies=>{:epitheton=>"dahliae", :rank=>"f.", :authorship=>"Movss.     1967", :basionymAuthorTeam=>{:authorTeam=>"Movss.", :author=>["Movss."], :year=>"1967"}}}
+    pos(sn).should == {0=>["genus", 12], 16=>["species", 25], 36=>["infraspecies", 43], 47=>["author_word", 53], 58=>["year", 62]}
+    parse('Polypodium vulgare nothosubsp. mantoniae (Rothm.) Schidlay').should_not be_nil
   end
   
   it "should parse name with several subspecies names NOT BOTANICAL CODE BUT NOT INFREQUENT" do
     sn = "Hydnellum scrobiculatum var. zonatum f. parvum (Banker) D. Hall & D.E. Stuntz 1972"
     parse(sn).should_not be_nil
     value(sn).should == "Hydnellum scrobiculatum var. zonatum f. parvum (Banker) D. Hall et D.E. Stuntz 1972"
-    details(sn).should ==  {:genus=>"Hydnellum", :species=>"scrobiculatum", :subspecies=>[{:rank=>"var.", :value=>"zonatum"}, {:rank=>"f.", :value=>"parvum"}], :is_valid=>false, :orig_authors=>{:names=>["Banker"]}, :authors=>{:names=>["D. Hall", "D.E. Stuntz"], :year=>"1972"}, :name_part_verbatim=>"Hydnellum scrobiculatum var. zonatum f. parvum", :auth_part_verbatim=>"(Banker) D. Hall & D.E. Stuntz 1972"}
-    pos(sn).should ==  {0=>["genus", 9], 10=>["species", 23], 29=>["subspecies", 36], 40=>["subspecies", 46], 48=>["author_word", 54], 56=>["author_word", 58], 59=>["author_word", 63], 66=>["author_word", 70], 71=>["author_word", 77], 78=>["year", 82]}
+    details(sn).should ==  {:genus=>{:epitheton=>"Hydnellum"}, :species=>{:epitheton=>"scrobiculatum"}, :infraspecies=>[{:epitheton=>"zonatum", :rank=>"var."}, {:epitheton=>"parvum", :rank=>"f.", :authorship=>"(Banker) D. Hall & D.E. Stuntz 1972", :combinationAuthorTeam=>{:authorTeam=>"D. Hall & D.E. Stuntz", :author=>["D. Hall", "D.E. Stuntz"], :year=>"1972"}, :basionymAuthorTeam=>{:authorTeam=>"Banker", :author=>["Banker"]}}]}
+    pos(sn).should ==  {0=>["genus", 9], 10=>["species", 23], 29=>["infraspecies", 36], 40=>["infraspecies", 46], 48=>["author_word", 54], 56=>["author_word", 58], 59=>["author_word", 63], 66=>["author_word", 70], 71=>["author_word", 77], 78=>["year", 82]}
+    parse('Senecio fuchsii C.C.Gmel. subsp. fuchsii var. expansus (Boiss. & Heldr.) Hayek').should_not be_nil
+    parse('Senecio fuchsii C.C.Gmel. subsp. fuchsii var. fuchsii').should_not be_nil
   end
   
+  
   it "should parse status BOTANICAL RARE" do
     #it is always latin abbrev often 2 words
     sn = "Arthopyrenia hyalospora (Nyl.) R.C. Harris comb. nov."
     parse(sn).should_not be_nil
     value(sn).should == "Arthopyrenia hyalospora (Nyl.) R.C. Harris comb. nov."
     canonical(sn).should == "Arthopyrenia hyalospora"
-    details(sn).should ==  {:genus=>"Arthopyrenia", :species=>"hyalospora", :orig_authors=>{:names=>["Nyl."]}, :authors=>{:names=>["R.C. Harris"]}, :status=>"comb. nov.", :name_part_verbatim=>"Arthopyrenia hyalospora", :auth_part_verbatim=>"(Nyl.) R.C. Harris comb. nov."}
+    details(sn).should ==  {:genus=>{:epitheton=>"Arthopyrenia"}, :species=>{:epitheton=>"hyalospora", :authorship=>"(Nyl.) R.C. Harris", :combinationAuthorTeam=>{:authorTeam=>"R.C. Harris ", :author=>["R.C. Harris"]}, :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."]}}, :status=>"comb. nov."}
     pos(sn).should == {0=>["genus", 12], 13=>["species", 23], 25=>["author_word", 29], 31=>["author_word", 35], 36=>["author_word", 42]}
   end
   
-  it "should parse name without a year but with authors" do 
-    sn = "Arthopyrenia hyalospora(Nyl.)R.C.     Harris"
-    parse(sn).should_not be_nil
-    value(sn).should == "Arthopyrenia hyalospora (Nyl.) R.C. Harris"
-    canonical(sn).should == "Arthopyrenia hyalospora"
-    pos(sn).should == {0=>["genus", 12], 13=>["species", 23], 24=>["author_word", 28], 29=>["author_word", 33], 38=>["author_word", 44]}
-  end
-  
   it "should parse revised (ex) names" do
     #invalidly published
     sn = "Arthopyrenia hyalospora (Nyl. ex Banker) R.C. Harris"
     parse(sn).should_not be_nil
     value(sn).should == "Arthopyrenia hyalospora (Nyl. ex Banker) R.C. Harris"
     canonical(sn).should == "Arthopyrenia hyalospora"
-    details(sn).should == {:genus=>"Arthopyrenia", :species=>"hyalospora", :original_revised_name_authors=>{:revised_authors=>{:names=>["Nyl."]}, :authors=>{:names=>["Banker"]}}, :authors=>{:names=>["R.C. Harris"]}, :name_part_verbatim=>"Arthopyrenia hyalospora", :auth_part_verbatim=>"(Nyl. ex Banker) R.C. Harris"}
+    details(sn).should == {:genus=>{:epitheton=>"Arthopyrenia"}, :species=>{:epitheton=>"hyalospora", :authorship=>"(Nyl. ex Banker) R.C. Harris", :combinationAuthorTeam=>{:authorTeam=>"R.C. Harris", :author=>["R.C. Harris"]}, :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."], :exAuthorTeam=>{:authorTeam=>"Banker", :author=>["Banker"]}}}}
     pos(sn).should == {0=>["genus", 12], 13=>["species", 23], 25=>["author_word", 29], 33=>["author_word", 39], 41=>["author_word", 45], 46=>["author_word", 52]}
-    
-    parse("Arthopyrenia hyalospora Nyl. ex Banker").should_not be_nil
+    sn = "Arthopyrenia hyalospora Nyl. ex Banker"
+    parse(sn).should_not be_nil
+    details(sn).should == {:genus=>{:epitheton=>"Arthopyrenia"}, :species=>{:epitheton=>"hyalospora", :authorship=>"Nyl. ex Banker", :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."], :exAuthorTeam=>{:authorTeam=>"Banker", :author=>["Banker"]}}}}
     sn = "Glomopsis lonicerae Peck ex C.J. Gould 1945"
     parse(sn).should_not be_nil
-    details(sn).should == {:genus=>"Glomopsis", :species=>"lonicerae", :revised_name_authors=>{:revised_authors=>{:names=>["Peck"]}, :authors=>{:names=>["C.J. Gould"], :year=>"1945"}}, :name_part_verbatim=>"Glomopsis lonicerae", :auth_part_verbatim=>"Peck ex C.J. Gould 1945"}
+    details(sn).should == {:genus=>{:epitheton=>"Glomopsis"}, :species=>{:epitheton=>"lonicerae", :authorship=>"Peck ex C.J. Gould 1945", :basionymAuthorTeam=>{:authorTeam=>"Peck", :author=>["Peck"], :exAuthorTeam=>{:authorTeam=>"C.J. Gould", :author=>["C.J. Gould"], :year=>"1945"}}}}
     pos(sn).should == {0=>["genus", 9], 10=>["species", 19], 20=>["author_word", 24], 28=>["author_word", 32], 33=>["author_word", 38], 39=>["year", 43]}
     parse("Acanthobasidium delicatum (Wakef.) Oberw. ex Jülich 1979").should_not be_nil
     sn = "Mycosphaerella eryngii (Fr. ex Duby) Johanson ex Oudem. 1897"
     parse(sn).should_not be_nil
-    details(sn).should == {:genus=>"Mycosphaerella", :species=>"eryngii", :original_revised_name_authors=>{:revised_authors=>{:names=>["Fr."]}, :authors=>{:names=>["Duby"]}}, :revised_name_authors=>{:revised_authors=>{:names=>["Johanson"]}, :authors=>{:names=>["Oudem."], :year=>"1897"}}, :name_part_verbatim=>"Mycosphaerella eryngii", :auth_part_verbatim=>"(Fr. ex Duby) Johanson ex Oudem. 1897"}
+    details(sn).should == {:genus=>{:epitheton=>"Mycosphaerella"}, :species=>{:epitheton=>"eryngii", :authorship=>"(Fr. ex Duby) Johanson ex Oudem. 1897", :combinationAuthorTeam=>{:authorTeam=>"Johanson", :author=>["Johanson"], :exAuthorTeam=>{:authorTeam=>"Oudem.", :author=>["Oudem."], :year=>"1897"}}, :basionymAuthorTeam=>{:authorTeam=>"Fr.", :author=>["Fr."], :exAuthorTeam=>{:authorTeam=>"Duby", :author=>["Duby"]}}}}
     pos(sn).should == {0=>["genus", 14], 15=>["species", 22], 24=>["author_word", 27], 31=>["author_word", 35], 37=>["author_word", 45], 49=>["author_word", 55], 56=>["year", 60]}
     #invalid but happens
     parse("Mycosphaerella eryngii (Fr. Duby) ex Oudem. 1897").should_not be_nil
     parse("Mycosphaerella eryngii (Fr.ex Duby) ex Oudem. 1897").should_not be_nil
     sn = "Salmonella werahensis (Castellani) Hauduroy and Ehringer in Hauduroy 1937"
     parse(sn).should_not be_nil
+    details(sn).should == {:genus=>{:epitheton=>"Salmonella"}, :species=>{:epitheton=>"werahensis", :authorship=>"(Castellani) Hauduroy and Ehringer in Hauduroy 1937", :combinationAuthorTeam=>{:authorTeam=>"Hauduroy and Ehringer", :author=>["Hauduroy", "Ehringer"], :exAuthorTeam=>{:authorTeam=>"Hauduroy", :author=>["Hauduroy"], :year=>"1937"}}, :basionymAuthorTeam=>{:authorTeam=>"Castellani", :author=>["Castellani"]}}}
     pos(sn).should == {0=>["genus", 10], 11=>["species", 21], 23=>["author_word", 33], 35=>["author_word", 43], 48=>["author_word", 56], 60=>["author_word", 68], 69=>["year", 73]}
   end
-  
-  it "should parse multiplication sign" do
-    sn = "Arthopyrenia x hyalospora (Nyl.) R.C. Harris"
-    parse(sn).should_not be_nil
-    details(sn).should == {:genus=>"Arthopyrenia", :species=>"hyalospora", :cross=>"inside", :orig_authors=>{:names=>["Nyl."]}, :authors=>{:names=>["R.C. Harris"]}, :name_part_verbatim=>"Arthopyrenia x hyalospora", :auth_part_verbatim=>"(Nyl.) R.C. Harris"}
-    pos(sn).should == {0=>["genus", 12], 15=>["species", 25], 27=>["author_word", 31], 33=>["author_word", 37], 38=>["author_word", 44]}
-    parse("Arthopyrenia X hyalospora(Nyl. ex Banker) R.C. Harris").should_not be_nil
-    sn = "x Arthopyrenia hyalospora (Nyl. ex Banker) R.C. Harris"
-    parse(sn).should_not be_nil
-    details(sn).should ==  {:genus=>"Arthopyrenia", :species=>"hyalospora", :cross=>"before", :original_revised_name_authors=>{:revised_authors=>{:names=>["Nyl."]}, :authors=>{:names=>["Banker"]}}, :authors=>{:names=>["R.C. Harris"]}, :name_part_verbatim=>"x Arthopyrenia hyalospora", :auth_part_verbatim=>"(Nyl. ex Banker) R.C. Harris"}
-    pos(sn).should == {2=>["genus", 14], 15=>["species", 25], 27=>["author_word", 31], 35=>["author_word", 41], 43=>["author_word", 47], 48=>["author_word", 54]}
-    sn = "X Arthopyrenia (Nyl. ex Banker) R.C. Harris"
-    parse(sn).should_not be_nil
-    details(sn).should == {:uninomial=>"Arthopyrenia", :cross=>"before", :original_revised_name_authors=>{:revised_authors=>{:names=>["Nyl."]}, :authors=>{:names=>["Banker"]}}, :authors=>{:names=>["R.C. Harris"]}, :name_part_verbatim=>"X Arthopyrenia", :auth_part_verbatim=>"(Nyl. ex Banker) R.C. Harris"}
-    pos(sn).should == {2=>["uninomial", 14], 16=>["author_word", 20], 24=>["author_word", 30], 32=>["author_word", 36], 37=>["author_word", 43]}
-    #ascii for multiplication
-    parse("Melampsora × columbiana G. Newc. 2000").should_not be_nil
+    
+  it 'should parse named hybrids' do
+    [
+      ["×Agropogon P. Fourn. 1934", {:namedHybrid=>{:uninomial=>{:epitheton=>"Agropogon", :authorship=>"P. Fourn. 1934", :basionymAuthorTeam=>{:authorTeam=>"P. Fourn.", :author=>["P. Fourn."], :year=>"1934"}}}}],
+      ["xAgropogon P. Fourn.", {:namedHybrid=>{:uninomial=>{:epitheton=>"Agropogon", :authorship=>"P. Fourn.", :basionymAuthorTeam=>{:authorTeam=>"P. Fourn.", :author=>["P. Fourn."]}}}}],
+      ["XAgropogon P.Fourn.", {:namedHybrid=>{:uninomial=>{:epitheton=>"Agropogon", :authorship=>"P.Fourn.", :basionymAuthorTeam=>{:authorTeam=>"P.Fourn.", :author=>["P.Fourn."]}}}}],
+      ["× Agropogon", {:namedHybrid=>{:uninomial=>{:epitheton=>"Agropogon"}}}],
+      ["x Agropogon", {:namedHybrid=>{:uninomial=>{:epitheton=>"Agropogon"}}}],
+      ["X Agropogon", {:namedHybrid=>{:uninomial=>{:epitheton=>"Agropogon"}}}],
+      ["X Cupressocyparis leylandii", {:namedHybrid=>{:genus=>{:epitheton=>"Cupressocyparis"}, :species=>{:epitheton=>"leylandii"}}}],
+      ["×Heucherella tiarelloides", {:namedHybrid=>{:genus=>{:epitheton=>"Heucherella"}, :species=>{:epitheton=>"tiarelloides"}}}],
+      ["xHeucherella tiarelloides", {:namedHybrid=>{:genus=>{:epitheton=>"Heucherella"}, :species=>{:epitheton=>"tiarelloides"}}}],
+      ["x Heucherella tiarelloides", {:namedHybrid=>{:genus=>{:epitheton=>"Heucherella"}, :species=>{:epitheton=>"tiarelloides"}}}],
+      ["×Agropogon littoralis (Sm.) C. E. Hubb. 1946", {:namedHybrid=>{:genus=>{:epitheton=>"Agropogon"}, :species=>{:epitheton=>"littoralis", :authorship=>"(Sm.) C. E. Hubb. 1946", :combinationAuthorTeam=>{:authorTeam=>"C. E. Hubb.", :author=>["C. E. Hubb."], :year=>"1946"}, :basionymAuthorTeam=>{:authorTeam=>"Sm.", :author=>["Sm."]}}}}]
+    ].each do |res| 
+      parse(res[0]).should_not be_nil
+      details(res[0]).should == res[1]
+    end
+   [ 
+    ['Asplenium X inexpectatum (E.L. Braun 1940) Morton (1956)',{:genus=>{:epitheton=>"Asplenium"}, :species=>{:epitheton=>"inexpectatum", :namedHybrid=>true, :authorship=>"(E.L. Braun 1940) Morton (1956)", :combinationAuthorTeam=>{:authorTeam=>"Morton", :author=>["Morton"], :year=>"1956"}, :basionymAuthorTeam=>{:authorTeam=>"E.L. Braun", :author=>["E.L. Braun"], :year=>"1940"}}}],
+    ['Mentha ×smithiana R. A. Graham 1949',{:genus=>{:epitheton=>"Mentha"}, :species=>{:epitheton=>"smithiana", :namedHybrid=>true, :authorship=>"R. A. Graham 1949", :basionymAuthorTeam=>{:authorTeam=>"R. A. Graham", :author=>["R. A. Graham"], :year=>"1949"}}}],
+    ['Salix ×capreola Andersson (1867)',{:genus=>{:epitheton=>"Salix"}, :species=>{:epitheton=>"capreola", :namedHybrid=>true, :authorship=>"Andersson (1867)", :basionymAuthorTeam=>{:authorTeam=>"Andersson", :author=>["Andersson"], :year=>"1867"}}}],
+    ['Salix x capreola Andersson',{:genus=>{:epitheton=>"Salix"}, :species=>{:epitheton=>"capreola", :namedHybrid=>true, :authorship=>"Andersson", :basionymAuthorTeam=>{:authorTeam=>"Andersson", :author=>["Andersson"]}}}]
+   ].each do |res|
+      parse(res[0]).should_not be_nil
+      details(res[0]).should == res[1]
+   end
   end
   
   it "should parse hybrid combination" do
     sn = "Arthopyrenia hyalospora X Hydnellum scrobiculatum"
-    parse(sn).should_not be_nil
+    parse(sn).should_not be_nil    
     value(sn).should == "Arthopyrenia hyalospora \303\227 Hydnellum scrobiculatum"
-    canonical(sn).should == "Arthopyrenia hyalospora \303\227 Hydnellum scrobiculatum"
-    details(sn).should == {:hybrid=>{:scientific_name1=>{:species=>"hyalospora", :genus=>"Arthopyrenia"}, :scientific_name2=>{:species=>"scrobiculatum", :genus=>"Hydnellum"}}}
+    canonical(sn).should == "Arthopyrenia hyalospora Hydnellum scrobiculatum"
+    details(sn).should == {:hybridFormula=>[{:genus=>{:epitheton=>"Arthopyrenia"}, :species=>{:epitheton=>"hyalospora"}}, {:genus=>{:epitheton=>"Hydnellum"}, :species=>{:epitheton=>"scrobiculatum"}}]}
     pos(sn).should == {0=>["genus", 12], 13=>["species", 23], 26=>["genus", 35], 36=>["species", 49]}
     sn = "Arthopyrenia hyalospora (Banker) D. Hall X Hydnellum scrobiculatum D.E. Stuntz"
     parse(sn).should_not be_nil
     value(sn).should == "Arthopyrenia hyalospora (Banker) D. Hall \303\227 Hydnellum scrobiculatum D.E. Stuntz"
-    canonical(sn).should == "Arthopyrenia hyalospora \303\227 Hydnellum scrobiculatum"
+    canonical(sn).should == "Arthopyrenia hyalospora Hydnellum scrobiculatum"
     pos(sn).should == {0=>["genus", 12], 13=>["species", 23], 25=>["author_word", 31], 33=>["author_word", 35], 36=>["author_word", 40], 43=>["genus", 52], 53=>["species", 66], 67=>["author_word", 71], 72=>["author_word", 78]}
     value("Arthopyrenia hyalospora X").should == "Arthopyrenia hyalospora \303\227 ?"  
     sn = "Arthopyrenia hyalospora x"
     parse(sn).should_not be_nil
     canonical(sn).should == "Arthopyrenia hyalospora"
-    details(sn).should == {:hybrid=>{:scientific_name1=>{:species=>"hyalospora", :genus=>"Arthopyrenia"}, :scientific_name2=>"?"}}  
+    details(sn).should == {:hybridFormula=>[{:genus=>{:epitheton=>"Arthopyrenia"}, :species=>{:epitheton=>"hyalospora"}}, "?"]}
     pos(sn).should == {0=>["genus", 12], 13=>["species", 23]}
     sn = "Arthopyrenia hyalospora × ?"
     parse(sn).should_not be_nil
-    details(sn).should == {:hybrid=>{:scientific_name1=>{:species=>"hyalospora", :genus=>"Arthopyrenia"}, :scientific_name2=>"?"}}
+    details(sn).should == {:hybridFormula=>[{:genus=>{:epitheton=>"Arthopyrenia"}, :species=>{:epitheton=>"hyalospora"}}, "?"]}
     pos(sn).should == {0=>["genus", 12], 13=>["species", 23]}
   end
-
   
-
-  it "should parse name with subspecies without rank NOT BOTANICAL" do
-    sn = "Hydnellum scrobiculatum zonatum (Banker) D. Hall & D.E. Stuntz 1972"
-    parse(sn).should_not be_nil
-    value(sn).should == "Hydnellum scrobiculatum zonatum (Banker) D. Hall et D.E. Stuntz 1972"
-    canonical(sn).should == "Hydnellum scrobiculatum zonatum"
-    details(sn).should == {:genus=>"Hydnellum", :species=>"scrobiculatum", :subspecies=>{:rank=>"n/a", :value=>"zonatum"}, :orig_authors=>{:names=>["Banker"]}, :authors=>{:names=>["D. Hall", "D.E. Stuntz"], :year=>"1972"}, :name_part_verbatim=>"Hydnellum scrobiculatum zonatum", :auth_part_verbatim=>"(Banker) D. Hall & D.E. Stuntz 1972"}
-    pos(sn).should == {0=>["genus", 9], 10=>["species", 23], 24=>["subspecies", 31], 33=>["author_word", 39], 41=>["author_word", 43], 44=>["author_word", 48], 51=>["author_word", 55], 56=>["author_word", 62], 63=>["year", 67]}
-    sn = "Begonia pingbienensis angustior"
+  it 'should parse names with taxon concept' do
+    sn = "Sténométope laevissimus sec. Eschmeyer 2004"
+    val = @parser.failure_reason.to_s.match(/column [0-9]*/).to_s().gsub(/column /,'')
+    details(sn).should == {:genus=>{:epitheton=>"Sténométope"}, :species=>{:epitheton=>"laevissimus"}, :taxon_concept=>{:authorship=>"Eschmeyer 2004", :basionymAuthorTeam=>{:authorTeam=>"Eschmeyer", :author=>["Eschmeyer"], :year=>"2004"}}}
+    pos(sn).should == {0=>["genus", 11], 12=>["species", 23], 29=>["author_word", 38], 39=>["year", 43]}
+    sn = "Sténométope laevissimus Bibron 1855 sec. Eschmeyer 2004"
     parse(sn).should_not be_nil
-    details(sn).should == {:genus=>"Begonia", :species=>"pingbienensis", :subspecies=>{:rank=>"n/a", :value=>"angustior"}}
-    pos(sn).should == {0=>["genus", 7], 8=>["species", 21], 22=>["subspecies", 31]}
+    details(sn).should == {:genus=>{:epitheton=>"Sténométope"}, :species=>{:epitheton=>"laevissimus", :authorship=>"Bibron 1855", :basionymAuthorTeam=>{:authorTeam=>"Bibron", :author=>["Bibron"], :year=>"1855"}}, :taxon_concept=>{:authorship=>"Eschmeyer 2004", :basionymAuthorTeam=>{:authorTeam=>"Eschmeyer", :author=>["Eschmeyer"], :year=>"2004"}}}
+    pos(sn).should == {0=>["genus", 11], 12=>["species", 23], 24=>["author_word", 30], 31=>["year", 35], 41=>["author_word", 50], 51=>["year", 55]}
   end
   
-  it "should not parse unallowed utf-8 chars in name part" do
-    parse("Érematosphaeria phaespora").should be_nil
-    parse("Trematosphaeria phaeáapora").should be_nil
-    parse("Trematоsphaeria phaeáapora").should be_nil #cyrillic o
+  it 'should parse names with spaces inconsistencies at the start and the end and in the middle' do
+    parse("   Asplenium X inexpectatum (E.L. Braun 1940) Morton (1956)   ").should_not be_nil
   end
   
-  it "should parse some invalid names" do
-    parse("Acarospora cratericola 1929").should_not be_nil
-    parse("Agaricus acris var. (b.)").should_not be_nil  
-    value("Agaricus acris var. (b.)").should == "Agaricus acris var. (b.)"  
-    parse("Agaricus acris var. (b.)").should_not be_nil 
-    sn = "Agaricus acris var. (b.&c.)"
-    value(sn).should == "Agaricus acris var. (b.c.)"  
-    details(sn).should == {:editorial_markup=>"(b.c.)", :subspecies=>[{:rank=>"var.", :value=>nil}], :species=>"acris", :genus=>"Agaricus", :is_valid=>false}
-    pos(sn).should == {0=>["genus", 8], 9=>["species", 14]}
+  it 'should not parse serveral authors groups with several years NOT CORRECT' do
+    parse("Pseudocercospora dendrobii (H.C. Burnett 1883) (Leight.) (Movss. 1967) U. Braun & Crous 2003").should be_nil
   end
 
-  it 'should parse double parenthesis' do
-    sn = "Eichornia crassipes ( (Martius) ) Solms-Laub."
-    parse(sn).should_not be_nil
-    value(sn).should == "Eichornia crassipes (Martius) Solms-Laub."
-    details(sn).should == {:genus=>"Eichornia", :species=>"crassipes", :orig_authors=>{:names=>["Martius"]}, :authors=>{:names=>["Solms-Laub."]}, :name_part_verbatim=>"Eichornia crassipes", :auth_part_verbatim=>"( (Martius) ) Solms-Laub."}
-    pos(sn).should == {0=>["genus", 9], 10=>["species", 19], 23=>["author_word", 30], 34=>["author_word", 45]} 
+  it "should not parse unallowed utf-8 chars in name part" do
+    parse("Érematosphaeria phaespora").should be_nil
+    parse("Trematosphaeria phaeáapora").should be_nil
+    parse("Trematоsphaeria phaeáapora").should be_nil #cyrillic o
   end
 
-#  val = "Ferganoconcha? oblonga"
-  it 'should parse genus?' do
-    sn = "Ferganoconcha? oblonga"
-    parse(sn).should_not be_nil
-    value(sn).should == "Ferganoconcha oblonga"
-    details(sn).should == {:genus=>"Ferganoconcha", :species=>"oblonga"}   
-    pos(sn).should == {0=>["genus", 14], 15=>["species", 22]}
-  end
-  
-  it 'should parse new additions' do
-    sn = "Abacetus laevicollis de Chaudoir, 1869"
-    parse(sn).should_not be_nil
-    canonical(sn).should == 'Abacetus laevicollis'
-    sn = "Gastrosericus eremorum van Beaumont 1955"
-    canonical(sn).should == 'Gastrosericus eremorum'
-    sn = "Gastrosericus eremorum von Beaumont 1955"
-    canonical(sn).should == 'Gastrosericus eremorum'
-    sn = "Cypraeovula (Luponia) amphithales perdentata"
-    canonical(sn).should == 'Cypraeovula amphithales perdentata'
-    details(sn).should == {:genus=>"Cypraeovula", :subgenus=>"Luponia", :species=>"amphithales", :subspecies=>{:rank=>"n/a", :value=>"perdentata"}}
-    sn = "Polyrhachis orsyllus nat musculus Forel 1901"
-    canonical(sn).should == "Polyrhachis orsyllus musculus"
-    sn = 'Latrodectus 13-guttatus Thorell, 1875'
-    canonical(sn).should == 'Latrodectus 13-guttatus'
-    value(sn).should == 'Latrodectus 13-guttatus Thorell 1875'
-    sn = 'Latrodectus 3guttatus Thorell, 1875'
-    canonical(sn).should == 'Latrodectus 3-guttatus'
-    value(sn).should == 'Latrodectus 3-guttatus Thorell 1875'
-  end
   
-end
+end