Add fonts with different font-weights #3036

vbinithyanandamv · 2020-12-13T17:04:24Z

Closing: #2920

Now user can pass font-weight to differentiate the style using the following API.

JSPDF.addFont(postScriptName, fontName, fontStyle, fontWeight, encoding)

User can also be able to pass without a fontWeight and encoding.

JSPDF.addFont(postScriptName, fontName, fontStyle)

User can also only pass encoding using like this

JSPDF.addFont(postScriptName, fontName, null, encoding)

Need to discuss on this last case @HackbrettXXX

Need more input on Make sure that passing an encoding without fontWeight will still work.

HackbrettXXX · 2020-12-14T09:47:51Z

Need more input on Make sure that passing an encoding without fontWeight will still work.

What I mean is that this should still work:

JSPDF.addFont(postScriptName, fontName, fontStyle, encoding)

So we need to check if the 4th parameter is an encoding string (one of the four constants) or a fontWeight string (a number or a string like '500' or 'bold').

Regarding this:

JSPDF.addFont(postScriptName, fontName, null, encoding)

AFAIK, the (old) fontStyle parameter was not optional/nullable, so I think passing null as fontStyle should still be illegal. The fontWeight parameter should be optional for backwards compatibility, though.

HackbrettXXX · 2020-12-14T09:49:33Z

src/jspdf.js

+      throw new Error("Invalid Combination of fontweight and fontstyle");
+    }
+    if (fontWeight && fontStyle !== fontWeight) {
+      fontStyle = fontWeight == 400 ? 'normal' : fontWeight == 700 ? 'bold' : fontStyle + ' ' + fontWeight;


make sure to also compare with 'normal' and 'bold' strings as fontWeight values.

Maybe add a comment that the == vs === is intentional

vbinithyanandamv · 2020-12-14T09:56:08Z

Need more input on Make sure that passing an encoding without fontWeight will still work.

What I mean is that this should still work:
JSPDF.addFont(postScriptName, fontName, fontStyle, encoding)
So we need to check if the 4th parameter is an encoding string (one of the four constants) or a fontWeight string (a number or a string like '500' or 'bold').

Regarding this:
JSPDF.addFont(postScriptName, fontName, null, encoding)
AFAIK, the (old) fontStyle parameter was not optional/nullable, so I think passing null as fontStyle should still be illegal. The fontWeight parameter should be optional for backwards compatibility, though.

My bad i meant to make the fontweight parameter null. Anyways had a doubt on that item got it cleared now. Now will make it up based on the encoding check or fontweight argument check. which will keep the old code intact and same without creating many new change.

HackbrettXXX · 2020-12-16T09:29:51Z

src/jspdf.js

+    fontWeight,
+    encoding
+  ) {
+    let encodingOptions = [


Can't use let. We need to write es5 code.

HackbrettXXX · 2020-12-16T09:30:47Z

src/jspdf.js

+      //IE 11 fix
+      encoding = arguments[3];
+    } else if (arguments[3] && encodingOptions.indexOf(arguments[3]) == -1) {
+      //if weired combination of fontweight and font style throw error


src/jspdf.js

HackbrettXXX · 2020-12-16T09:40:27Z

src/jspdf.js

+        (fontStyle == "normal" && fontWeight == "bold") ||
+        (fontStyle == "bold" && fontWeight == "normal") ||
+        (fontStyle == "bold" && fontWeight == 400) ||
+        (fontStyle == "normal" && fontWeight == 700)


normal+700 as well

HackbrettXXX · 2020-12-16T09:44:19Z

src/jspdf.js

+        fontStyle =
+          fontWeight == 400
+            ? "normal"
+            : fontWeight == 700
+            ? "bold"
+            : fontStyle + "" + fontWeight;


What about "italic" fontStyle? E.g. "italic" + "400" should result in "italic".

test/specs/putTotalPages.spec.js

HackbrettXXX

We also need to change the signatures in the types/index.d.ts file.

HackbrettXXX · 2020-12-18T15:10:32Z

src/jspdf.js

@@ -4795,7 +4795,8 @@ function jsPDF(options) {
   * @memberof jsPDF#
   * @name setFont
   */
-  API.setFont = function(fontName, fontStyle) {
+  API.setFont = function(fontName, fontStyle, fontWeight) {
+    fontStyle = !fontWeight ? fontStyle : fontStyle + "" + fontWeight;


we need the same logic as in addFont here.

HackbrettXXX · 2020-12-18T15:10:45Z

src/jspdf.js

@@ -4850,14 +4851,52 @@ function jsPDF(options) {
   * @param {string} postScriptName PDF specification full name for the font.
   * @param {string} id PDF-document-instance-specific label assinged to the font.
   * @param {string} fontStyle Style of the Font.
+   * @param {number || string} fontWeight Weight of the Font.


number|string

src/jspdf.js

types/index.d.ts

HackbrettXXX

Alright, looks good to me now. Please run prettier again, and I'll merge it.

vbinithyanandamv · 2020-12-21T11:57:16Z

Alright, looks good to me now. Please run prettier again, and I'll merge it.

@HackbrettXXX added prettier run already.

vbinithyanandamv · 2020-12-21T12:08:46Z

@HackbrettXXX build is failing on some wired issue in all PR.

vbinithyanandamv added 3 commits December 13, 2020 22:24

Add fonts with different font-weights #2920

5c6f8e4

Handled Optional

9aac019

Undefined cases handled

847e5af

vbinithyanandamv changed the title ~~Add fonts with different font-weights #2920~~ Add fonts with different font-weights Dec 13, 2020

Test Fixed

1c54cfb

HackbrettXXX requested changes Dec 14, 2020

View reviewed changes

vbinithyanandamv added 5 commits December 14, 2020 22:17

handled custom fontweight and added test cases

d4accaf

removed console

9309552

ie fix

6b6b00b

Preetier added

37171b9

Merge branch 'master' of https://github.com/MrRio/jsPDF into font-weight

1b73948

HackbrettXXX requested changes Dec 16, 2020

View reviewed changes

Review changes added

f760a2e

vbinithyanandamv requested a review from HackbrettXXX December 16, 2020 13:28

allansson mentioned this pull request Dec 17, 2020

Resolve fonts using CSS Level 3 algorithm when using html() #3040

Merged

HackbrettXXX requested changes Dec 18, 2020

View reviewed changes

vbinithyanandamv added 2 commits December 20, 2020 19:06

Fontweight logic added in setfont

d8ecb73

review Feedback updated

5403236

vbinithyanandamv requested a review from HackbrettXXX December 20, 2020 13:52

vbinithyanandamv added 2 commits December 20, 2020 19:23

prettier done.

60ed833

test case added for setfont

c2f4cc1

HackbrettXXX requested changes Dec 21, 2020

View reviewed changes

src/jspdf.js Outdated Show resolved Hide resolved

types/index.d.ts Outdated Show resolved Hide resolved

types/index.d.ts Outdated Show resolved Hide resolved

types/index.d.ts Outdated Show resolved Hide resolved

review feedback updated

18dc53e

HackbrettXXX requested changes Dec 21, 2020

View reviewed changes

Run preetier

6b45c14

vbinithyanandamv requested a review from HackbrettXXX December 21, 2020 12:08

HackbrettXXX mentioned this pull request Jun 17, 2021

Disjuncture on example codes and documentation #3187

Closed

EugeneBalabai mentioned this pull request Jun 26, 2021

Add fonts with different font-weights yWorks/svg2pdf.js#181

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add fonts with different font-weights #3036

Add fonts with different font-weights #3036

vbinithyanandamv commented Dec 13, 2020

HackbrettXXX commented Dec 14, 2020

HackbrettXXX Dec 14, 2020

vbinithyanandamv commented Dec 14, 2020 •

edited

HackbrettXXX Dec 16, 2020

vbinithyanandamv Dec 16, 2020

HackbrettXXX Dec 16, 2020

vbinithyanandamv Dec 16, 2020

HackbrettXXX Dec 16, 2020

vbinithyanandamv Dec 16, 2020

HackbrettXXX Dec 16, 2020

vbinithyanandamv Dec 16, 2020

HackbrettXXX left a comment

HackbrettXXX Dec 18, 2020

HackbrettXXX Dec 18, 2020

HackbrettXXX left a comment

vbinithyanandamv commented Dec 21, 2020

vbinithyanandamv commented Dec 21, 2020 •

edited

Add fonts with different font-weights #3036

Add fonts with different font-weights #3036

Conversation

vbinithyanandamv commented Dec 13, 2020

HackbrettXXX commented Dec 14, 2020

Choose a reason for hiding this comment

vbinithyanandamv commented Dec 14, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HackbrettXXX left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HackbrettXXX left a comment

Choose a reason for hiding this comment

vbinithyanandamv commented Dec 21, 2020

vbinithyanandamv commented Dec 21, 2020 • edited

vbinithyanandamv commented Dec 14, 2020 •

edited

vbinithyanandamv commented Dec 21, 2020 •

edited