Merge pull request #12 from engeir/master

fix(extract_citekeys): match against apastyle prenotes
jwcarr · Jun 13, 2024 · df2b9e1 · df2b9e1
2 parents be49f1a + 7f7ea15
commit df2b9e1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/bibfish/__init__.py b/bibfish/__init__.py
@@ -41,10 +41,11 @@ def extract_citekeys(manuscript_file: str, cite_commands: list) -> list:
         except FileNotFoundError:
             pass
     citations = re.findall(
-        r"\\(" + "|".join(cite_commands) + r")(\[.+?\])?.*?\{(.*?)\}", manuscript
+        r"\\(" + "|".join(cite_commands) + r")(<.+?>)?.*?(\[.+?\])?.*?\{(.*?)\}",
+        manuscript,
     )
     for citation in citations:
-        for key in citation[2].replace(" ", "").split(","):
+        for key in citation[3].replace(" ", "").split(","):
             if key:
                 citekeys.append(key)
     return list(set(citekeys))