add FreeSerif font to handle special characters

cBioPortal · Mar 22, 2019 · 0755104 · 0755104
1 parent 871b94c
commit 0755104
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/src/pages/studyView/charts/barChart/BarChartAxisLabel.tsx b/src/pages/studyView/charts/barChart/BarChartAxisLabel.tsx
@@ -26,32 +26,29 @@ export class BarChartAxisLabel extends VictoryLabel {
             key: style[0].textAnchor || textAnchor
         };
 
-        let tspan;
+        let tspan = [];
 
         // add the second string as a superscript
         // we are not using baselineShift property due to compatibility issues, instead adjusting dy
         // for more details see https://stackoverflow.com/questions/12332448/subscripts-and-superscripts-in-svg
         if (content.length > 1) {
-            tspan = (
-                <tspan {...tspanProps}>
-                    {content[0]}
-                    <tspan
-                        dy={-style[0].fontSize/2}
-                        style={{...style[0], fontSize: "70%"}}
-                    >
-                        {content[1]}
-                    </tspan>
-                </tspan>
-            );
+            tspan.push(<tspan {...tspanProps}>{content[0]}</tspan>);
+            tspan.push(
+                        <tspan
+                            dy={-style[0].fontSize/2}
+                            style={{...style[0], fontSize: style[0].fontSize * 0.7}}
+                        >
+                            {content[1]}
+                        </tspan>);
         }
         else {
-            tspan = <tspan {...tspanProps}>{content[0]}</tspan>;
+            tspan.push(<tspan {...tspanProps}>{content[0]}</tspan>);
         }
 
         return React.cloneElement(
             props.textComponent,
             { dx, dy, x, y, events, transform, className, title, desc },
-            [tspan]
+            tspan
         );
     }
 }

diff --git a/src/shared/lib/svgToPdfDownload.ts b/src/shared/lib/svgToPdfDownload.ts
@@ -37,7 +37,11 @@ export default function svgToPdfDownload(fileName: string, svg: any) {
     }
 
     const pdf = new jsPDF(direction, 'pt', [width, height]);
-
+
+    const font = require("shared/static-data/font.json");
+    pdf.addFileToVFS("FreeSans-normal.ttf", font.FreeSans);
+    pdf.addFont("FreeSans-normal.ttf", "FreeSans", "normal");
+
     // render the svg element
     svg2pdf(svg, pdf, {
         xOffset: 0,

diff --git a/src/shared/static-data/font.json b/src/shared/static-data/font.json
diff --git a/src/shared/theme/cBioPoralTheme.ts b/src/shared/theme/cBioPoralTheme.ts
@@ -41,7 +41,7 @@ const baseProps = {
 // * Labels
 // *
 export const baseLabelStyles = {
-    fontFamily: sansSerif,
+    fontFamily: `FreeSans, ${sansSerif}`,
     fontSize,
     letterSpacing,
     padding,