Merge pull request #1565 from cboard-org/revert-1555-fix/support-font…

…s-pdf Revert "Fix Text for pdf exported boards "
cboard-org · Aug 18, 2023 · 8decf28 · 8decf28
2 parents b266a7c + 0644c43
commit 8decf28
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 75 deletions.
diff --git a/src/components/Settings/Export/Export.helpers.js b/src/components/Settings/Export/Export.helpers.js
@@ -37,66 +37,22 @@ pdfMake.vfs = pdfFonts.pdfMake.vfs;
 // Add all supported fonts for languages
 pdfMake.fonts = {
   Khmer: {
-    normal:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/Khmer-Regular.ttf',
-    bold:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/Khmer-Regular.ttf'
+    normal: 'Khmer-Regular.ttf',
+    bold: 'Khmer-Regular.ttf'
   },
   Roboto: {
     normal: 'Roboto-Regular.ttf',
-    bold: 'Roboto-Regular.ttf'
+    bold: 'Roboto-Medium.ttf',
+    italics: 'Roboto-Italic.ttf',
+    bolditalics: 'Roboto-MediumItalic.ttf'
   },
   Tajawal: {
-    normal:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/Tajawal-Regular.ttf',
-    bold:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/Tajawal-Regular.ttf'
+    normal: 'Tajawal-Regular.ttf',
+    bold: 'Tajawal-Bold.ttf'
   },
   THSarabunNew: {
-    normal:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/Sarabun-Regular.ttf',
-    bold:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/Sarabun-Regular.ttf'
-  },
-  Hind: {
-    normal:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/Hind-Medium.ttf',
-    bold:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/Hind-Medium.ttf'
-  },
-  NotoSansHebrew: {
-    normal:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/NotoSansHebrew.ttf',
-    bold:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/NotoSansHebrew.ttf'
-  },
-  NotoSansJP: {
-    normal:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/NotoSansJP-Regular.ttf',
-    bold:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/NotoSansJP-Regular.ttf'
-  },
-  NotoSansKR: {
-    normal:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/NotoSansKR.otf',
-    bold: 'https://cboardgroupqadiag.blob.core.windows.net/fonts/NotoSansKR.otf'
-  },
-  NotoSansNP: {
-    normal:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/NotoSansNP.ttf',
-    bold: 'https://cboardgroupqadiag.blob.core.windows.net/fonts/NotoSansNP.ttf'
-  },
-  NotoSansSC: {
-    normal:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/NotoSansSC-Regular.otf',
-    bold:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/NotoSansSC-Regular.otf'
-  },
-  NotoSerifBengali: {
-    normal:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/NotoSerifBengali.ttf',
-    bold:
-      'https://cboardgroupqadiag.blob.core.windows.net/fonts/NotoSerifBengali.ttf'
+    normal: 'THSarabunNew.ttf',
+    bold: 'THSarabunNew.ttf'
   }
 };
 
@@ -934,27 +890,6 @@ export async function pdfExportAdapter(boards = [], intl, picsee = false) {
     case 'th':
       font = 'THSarabunNew';
       break;
-    case 'hi':
-      font = 'Hind';
-      break;
-    case 'he':
-      font = 'NotoSansHebrew';
-      break;
-    case 'ja':
-      font = 'NotoSansJP';
-      break;
-    case 'ko':
-      font = 'NotoSansKR';
-      break;
-    case 'ne':
-      font = 'NotoSansNP';
-      break;
-    case 'zh':
-      font = 'NotoSansSC';
-      break;
-    case 'bn':
-      font = 'NotoSerifBengali';
-      break;
     default:
       font = 'Roboto';
   }

diff --git a/src/vfs_fonts.js b/src/vfs_fonts.js