Add fonts with different font-weights

src/applyparseattributes.ts

@@ -9,6 +9,7 @@ import { parseFill } from './fill/parseFill'
 import { ColorFill } from './fill/ColorFill'
 import { GState } from 'jspdf'
 import { RGBColor } from './utils/rgbcolor'
+import { combineFontStyleAndFontWeight } from './utils/combineFontStyleAndFontWeight'
 
 export function parseAttributes(context: Context, svgNode: SvgNode, node?: Element): void {
   const domNode = node || svgNode.element
@@ -277,17 +278,10 @@ export function applyAttributes(
     childContext.attributeState.fontWeight !== parentContext.attributeState.fontWeight ||
     childContext.attributeState.fontStyle !== parentContext.attributeState.fontStyle
   ) {
-    fontStyle = ''
-    if (childContext.attributeState.fontWeight === 'bold') {
-      fontStyle = 'bold'
-    }
-    if (childContext.attributeState.fontStyle === 'italic') {
-      fontStyle += 'italic'
-    }
-
-    if (fontStyle === '') {
-      fontStyle = 'normal'
-    }
+    fontStyle = combineFontStyleAndFontWeight(
+      childContext.attributeState.fontStyle,
+      childContext.attributeState.fontWeight
+    )
   }
 
   if (font !== undefined || fontStyle !== undefined) {

src/utils/combineFontStyleAndFontWeight.ts

@@ -0,0 +1,31 @@
+/**
+ * @function combineFontStyleAndFontWeight
+ * @param {string} fontStyle Fontstyle or variant. Example: "italic".
+ * @param {number | string} fontWeight Weight of the Font. Example: "normal" | 400
+ * @returns {string}
+ */
+export function combineFontStyleAndFontWeight(
+  fontStyle: string,
+  fontWeight: number | string
+): string {
+  if (
+    (fontStyle == 'bold' && fontWeight == 'normal') ||
+    (fontStyle == 'bold' && fontWeight == 400) ||
+    (fontStyle == 'normal' && fontWeight == 'italic') ||
+    (fontStyle == 'bold' && fontWeight == 'italic')
+  ) {
+    throw new Error('Invalid Combination of fontweight and fontstyle')
+  }
+  if (fontWeight && fontStyle !== fontWeight) {
+    //if fontstyle is normal and fontweight is normal too no need to append the font-weight
+    fontStyle =
+      fontWeight == 400
+        ? fontStyle == 'italic'
+          ? 'italic'
+          : 'normal'
+        : fontWeight == 700 && fontStyle !== 'italic'
+        ? 'bold'
+        : fontStyle + '' + fontWeight
+  }
+  return fontStyle
+}

src/utils/fonts.ts

@@ -5,6 +5,7 @@
  */
 import { AttributeState } from '../context/attributestate'
 import { Context } from '../context/context'
+import { combineFontStyleAndFontWeight } from './combineFontStyleAndFontWeight'
 
 export type FontFamily = string
 
@@ -27,16 +28,10 @@ export function findFirstAvailableFontFamily(
   fontFamilies: FontFamily[],
   context: Context
 ): FontFamily {
-  let fontType = ''
-  if (attributeState.fontWeight === 'bold') {
-    fontType = 'bold'
-  }
-  if (attributeState.fontStyle === 'italic') {
-    fontType += 'italic'
-  }
-  if (fontType === '') {
-    fontType = 'normal'
-  }
+  const fontType = combineFontStyleAndFontWeight(
+    attributeState.fontStyle,
+    attributeState.fontWeight
+  )
 
   const availableFonts = context.pdf.getFontList()
   let firstAvailable = ''