For people whose names have a suffix (like Richard III, or Sam Jr) extract that and keep it as part of the name

Author: gdudek

ged2dot.py

@@ -420,6 +420,19 @@ def __handle_level0(self, line: str) -> None:
             self.family = Family()
             self.family.set_identifier(line[1:-5])
 
+    def __handle_indi_name(self, line: str) -> None:
+        # Expected style: 'first /last/ suffix', suffix is optional.
+        tokens = line.split('/')
+        assert self.individual
+        self.individual.set_forename(tokens[0].strip())
+        if len(tokens) > 1:
+            self.individual.set_surname(tokens[1].strip())
+        if len(tokens) > 2 and tokens[2]:
+            # We have suffix, append that to the surname.
+            surname = self.individual.get_surname()
+            suffix = tokens[2].strip()
+            self.individual.set_surname(f"{surname} {suffix}")
+
     def __handle_level1(self, line: str) -> None:
         self.__reset_flags()
 
@@ -431,10 +444,7 @@ def __handle_level1(self, line: str) -> None:
                 self.individual.set_sex(tokens[1])
         elif line_lead_token == "NAME" and self.individual:
             line = line[5:]
-            tokens = line.split('/')
-            self.individual.set_forename(tokens[0].strip())
-            if len(tokens) > 1:
-                self.individual.set_surname(tokens[1].strip())
+            self.__handle_indi_name(line)
         elif line_lead_token == "FAMC" and self.individual:
             # At least <https://www.ancestry.com> sometimes writes multiple FAMC, which doesn't
             # make sense. Import only the first one.

tests/suffix.ged

@@ -0,0 +1,13 @@
+0 HEAD
+0 @P1@ INDI 
+1 NAME Alice /A/ Suffix
+1 SEX F
+1 FAMS @F1@
+0 @P2@ INDI 
+1 NAME Bob /B/
+1 SEX M
+1 FAMS @F1@
+0 @F1@ FAM 
+1 HUSB @P2@
+1 WIFE @P1@
+0 TRLR

tests/test_ged2dot.py

@@ -49,6 +49,19 @@ def test_big_endian_name(self) -> None:
         label = individual.get_label(image_dir="", name_order="big", birth_format="{}-", basepath="")
         self.assertIn("A<br/>Alice", label)
 
+    def test_name_suffix(self) -> None:
+        """Tests the case when the name has a suffix."""
+        config = {
+            "input": "tests/suffix.ged",
+        }
+        importer = ged2dot.GedcomImport()
+        graph = importer.tokenize(config)
+        individual = ged2dot.graph_find(graph, "P1")
+        assert individual
+        assert isinstance(individual, ged2dot.Individual)
+        label = individual.get_label(image_dir="", name_order="little", birth_format="{}-", basepath="")
+        self.assertIn("Alice<br/>A Suffix", label)
+
     def test_str(self) -> None:
         """Tests __str()__."""
         config = {