Support genus names with multiple hyphens; closes gnames#203

amazingplants · Nov 13, 2021 · 4ebcba6 · 4ebcba6
1 parent 6e213ef
commit 4ebcba6
Show file tree

Hide file tree

Showing 3 changed files with 3,019 additions and 2,939 deletions.
diff --git a/ent/parser/grammar.peg b/ent/parser/grammar.peg
@@ -128,12 +128,16 @@ CapWord <- CapWordWithDash / CapWord1
 
 CapWord1 <- NameUpperChar NameLowerChar NameLowerChar+ '?'?
 
-CapWordWithDash <- CapWord1 Dash (UpperAfterDash / LowerAfterDash)
+CapWordWithDash <- CapWord1 Dash WordAfterDash
+
+WordAfterDash <- (WordWithDash / UpperAfterDash / LowerAfterDash)
 
 UpperAfterDash <- CapWord1
 
 LowerAfterDash <- Word1
 
+WordWithDash <- (CapWord1 / Word1) Dash WordAfterDash
+
 TwoLetterGenus <- ('Ca' / 'Do' / 'Ea' / 'Ge' / 'Ia' / 'Io' / 'Ix' / 'Lo' /
   'Oa' / 'Oo' / 'Nu' / 'Ra' / 'Ty' / 'Ua' / 'Aa' / 'Ja' / 'Zu' / 'La' / 'Qu' /
   'As' / 'Ba')