annotations without space (close #140)

Adds support to annotations that do not have space between words,
for example `sp.nov.`, `nom.nov.` etc.

Author: dimus

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Add [#140]: support nomenclatural annotations without space, like `sp.nov.`.
+
 ## [v1.1.3] - 2023-07-01 Sat
 
 - Add [#139]: `nom. nov.` as nomenclatural annotation.

pkg/ent/output/process.go

@@ -146,14 +146,20 @@ func annotNomen(after []token.TokenSN) string {
 		if len(annot) > 1 {
 			break
 		}
+		annotNoSpace, ok := noSpaceAnnot(v)
+		if ok {
+			return annotNoSpace
+		}
+
 		c := v.Cleaned()
 		isN := (c == "n" || c == "nv" || c == "nov")
 		if isN {
 			nNum++
 		}
-		isSp := (c == "sp" || c == "comb" || c == "subsp" || c == "ssp")
-		isNom := (c == "nom")
-		if isN || isSp || isNom {
+		isSp := c == "sp" || c == "comb" || c == "subsp" ||
+			c == "ssp" || c == "nom"
+
+		if isN || isSp {
 			annot = append(annot, string(v.Raw()))
 		} else {
 			annot = annot[0:0]
@@ -166,6 +172,20 @@ func annotNomen(after []token.TokenSN) string {
 	return ""
 }
 
+func noSpaceAnnot(t token.TokenSN) (string, bool) {
+	raw := string(t.Raw())
+	annots := []string{
+		"sp�nov", "comb�nov", "nom�nov",
+		"subsp�nov", "ssp�nov",
+	}
+	for i := range annots {
+		if t.Cleaned() == annots[i] {
+			return strings.TrimSpace(raw), true
+		}
+	}
+	return "", false
+}
+
 // UniqueNameStrings takes a list of names, and returns a list of unique
 // name-strings
 func (o *Output) UniqueNameStrings() []string {

pkg/gnfinder_test.go

@@ -531,6 +531,28 @@ func TestNomenAnnot(t *testing.T) {
 	}
 }
 
+// TestNomenAnnotNoSpace covers issue #140:
+// Process correctly annotations without spaces.
+func TestNomenAnnotNoSpace(t *testing.T) {
+	assert := assert.New(t)
+	tests := []struct {
+		txt, annot, annotType string
+	}{
+		{"Pardosa moesta sp.nov.", "sp.nov.", "SP_NOV"},
+		{"Pardosa moesta sp.nov...\n", "sp.nov...", "SP_NOV"},
+		{"Pardosa moesta comb.nov.\n", "comb.nov.", "COMB_NOV"},
+		{"Pardosa moesta nom.nov.", "nom.nov.", "NOM_NOV"},
+		{"Pardosa moesta subsp.nov.", "subsp.nov.", "SUBSP_NOV"},
+		{"Pardosa moesta ssp.nov.", "ssp.nov.", "SUBSP_NOV"},
+	}
+	gnf := genFinder()
+	for _, v := range tests {
+		res := gnf.Find("", v.txt)
+		assert.Equal(v.annot, res.Names[0].AnnotNomen)
+		assert.Equal(v.annotType, res.Names[0].AnnotNomenType)
+	}
+}
+
 func TestFakeAnnot(t *testing.T) {
 	assert := assert.New(t)
 	txts := []string{

pkg/version.go

@@ -1,6 +1,6 @@
 package gnfinder
 
 var (
-	Version = "v1.1.3"
+	Version = "v1.1.4"
 	Build   string
 )