Move fonts to JSON

mdslides · Feb 18, 2023 · e5b5f0e · e5b5f0e
1 parent fb974b7
commit e5b5f0e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/src/fonts/mulish.json b/src/fonts/mulish.json
diff --git a/src/fonts/mulishBold.ts b/src/fonts/mulishBold.ts
diff --git a/src/fonts/mulishBoldItalic.ts b/src/fonts/mulishBoldItalic.ts
diff --git a/src/fonts/mulishRegular.ts b/src/fonts/mulishRegular.ts
diff --git a/src/fonts/mulishRegularItalic.ts b/src/fonts/mulishRegularItalic.ts
diff --git a/src/utils/pdf.ts b/src/utils/pdf.ts
@@ -3,29 +3,32 @@ import { elementToSVG } from 'dom-to-svg'
 
 import 'svg2pdf.js'
 
-import mulishBoldFont from '../fonts/mulishBold'
-import mulishBoldItalicFont from '../fonts/mulishBoldItalic'
-import mulishRegularFont from '../fonts/mulishRegular'
-import mulishRegularItalicFont from '../fonts/mulishRegularItalic'
+import mulishFont from '../fonts/mulish.json'
 
 const format = [1200, 900]
 
+const addFonts = (doc: jsPDF) => {
+  doc.addFileToVFS('MulishBold.ttf', mulishFont.bold)
+  doc.addFileToVFS('MulishBoldItalic.ttf', mulishFont.boldItalic)
+  doc.addFileToVFS('MulishRegular.ttf', mulishFont.regular)
+  doc.addFileToVFS('MulishRegularItalic.ttf', mulishFont.regularItalic)
+
+  doc.addFont('MulishBold.ttf', 'Mulish', 'normal', 700)
+  doc.addFont('MulishBoldItalic.ttf', 'Mulish', 'italic', 700)
+  doc.addFont('MulishRegular.ttf', 'Mulish', 'normal', 400)
+  doc.addFont('MulishRegularItalic.ttf', 'Mulish', 'italic', 400)
+}
+
 export const createPdf = async (pages: HTMLCollection) => {
   const doc = new jsPDF({
+    filters: ['ASCIIHexEncode'],
     orientation: 'landscape',
     unit: 'px',
     format,
   })
 
+  addFonts(doc)
   doc.deletePage(1)
-  doc.addFileToVFS('MulishBold.ttf', mulishBoldFont)
-  doc.addFileToVFS('MulishBoldItalic.ttf', mulishBoldItalicFont)
-  doc.addFileToVFS('MulishRegular.ttf', mulishRegularFont)
-  doc.addFileToVFS('MulishRegularItalic.ttf', mulishRegularItalicFont)
-  doc.addFont('MulishBold.ttf', 'Mulish', 'normal', 700)
-  doc.addFont('MulishBoldItalic.ttf', 'Mulish', 'italic', 700)
-  doc.addFont('MulishRegular.ttf', 'Mulish', 'normal', 400)
-  doc.addFont('MulishRegularItalic.ttf', 'Mulish', 'italic', 400)
 
   for (const child of pages) {
     doc.addPage()