Merge pull request #133 from DmitrySharabin/biblatex-bibtype

When calculating `bibType`, consider the exact match first
fiduswriter · Aug 28, 2024 · 0373496 · 0373496
2 parents 1a9c590 + 9c6bc47
commit 0373496
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/src/import/biblatex.ts b/src/import/biblatex.ts
@@ -952,13 +952,22 @@ export class BibLatexParser {
             }
         }
 
-        let bibType = Object.keys(BibTypes).find((bType) => {
-            return (
-                BibTypes[bType]["biblatex"] === biblatexType &&
-                (!biblatexSubtype ||
-                    BibTypes[bType]["biblatex-subtype"] === biblatexSubtype)
-            )
-        })
+        let bibType
+        if (
+            biblatexType in BibTypes &&
+            (!biblatexSubtype ||
+                BibTypes[biblatexType]["biblatex-subtype"] === biblatexSubtype)
+        ) {
+            bibType = biblatexType
+        } else {
+            bibType = Object.keys(BibTypes).find((bType) => {
+                return (
+                    BibTypes[bType]["biblatex"] === biblatexType &&
+                    (!biblatexSubtype ||
+                        BibTypes[bType]["biblatex-subtype"] === biblatexSubtype)
+                )
+            })
+        }
 
         if (typeof bibType === "undefined") {
             this.warning({