From a277ca06ef1267d13c2cbb772715754ff6473271 Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Mon, 6 Dec 2021 09:33:42 +0000 Subject: [PATCH] More experiments with +100em bold --- Fonts/ECAMFontBold100em.ttf | Bin 0 -> 14620 bytes Models/Instruments/IESI/IESI.nas | 2 +- .../Instruments/Lower-ECAM/Lower-ECAM-base.nas | 2 +- Models/Instruments/ND/canvas/ND.nas | 6 +++--- Models/Instruments/ND/canvas/style.nas | 2 +- Models/Instruments/PFD/PFD.nas | 2 +- Models/Instruments/Upper-ECAM/Upper-ECAM.nas | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 Fonts/ECAMFontBold100em.ttf diff --git a/Fonts/ECAMFontBold100em.ttf b/Fonts/ECAMFontBold100em.ttf new file mode 100644 index 0000000000000000000000000000000000000000..ed53bb4a9e5e4c21885bbb107bf6a5826892f8b4 GIT binary patch literal 14620 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 FzXK(eA5Q=P literal 0 HcmV?d00001 diff --git a/Models/Instruments/IESI/IESI.nas b/Models/Instruments/IESI/IESI.nas index e3e167b8..e86c9a30 100644 --- a/Models/Instruments/IESI/IESI.nas +++ b/Models/Instruments/IESI/IESI.nas @@ -25,7 +25,7 @@ var canvas_IESI = { obj.group = obj.canvas.createGroup(); obj.font_mapper = func(family, weight) { - return "ECAMFontRegular.ttf"; + return "ECAMFontBold100em.ttf"; }; canvas.parsesvg(obj.group, svg, {"font-mapper": obj.font_mapper} ); diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-base.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-base.nas index 98e9260d..dbab5d5f 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-base.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-base.nas @@ -25,7 +25,7 @@ var canvas_lowerECAM_base = me.canvas.addPlacement({"node": "uecam.screen2"}); me.font_mapper = func(family, weight) { - return "ECAMFontRegular.ttf"; + return "ECAMFontBold100em.ttf"; }; me.test = me.canvas.createGroup(); diff --git a/Models/Instruments/ND/canvas/ND.nas b/Models/Instruments/ND/canvas/ND.nas index 1e2c4748..e7007bcc 100644 --- a/Models/Instruments/ND/canvas/ND.nas +++ b/Models/Instruments/ND/canvas/ND.nas @@ -69,7 +69,7 @@ var myCockpit_switches = { var canvas_nd_base = { init: func(canvas_group, file = nil) { var font_mapper = func(family, weight) { - return "ECAMFontRegular.ttf"; + return "ECAMFontBold100em.ttf"; }; if (file != nil) { @@ -264,7 +264,7 @@ var canvas_ND_2 = { var canvas_ND_1_test = { init: func(canvas_group, file) { var font_mapper = func(family, weight) { - return "ECAMFontRegular.ttf"; + return "ECAMFontBold100em.ttf"; }; canvas.parsesvg(canvas_group, file, {"font-mapper": font_mapper}); @@ -306,7 +306,7 @@ var canvas_ND_1_test = { var canvas_ND_2_test = { init: func(canvas_group, file) { var font_mapper = func(family, weight) { - return "ECAMFontRegular.ttf"; + return "ECAMFontBold100em.ttf"; }; canvas.parsesvg(canvas_group, file, {"font-mapper": font_mapper}); diff --git a/Models/Instruments/ND/canvas/style.nas b/Models/Instruments/ND/canvas/style.nas index 650ce7d2..419cb5de 100644 --- a/Models/Instruments/ND/canvas/style.nas +++ b/Models/Instruments/ND/canvas/style.nas @@ -20,7 +20,7 @@ var RED = [1.0000,0.0000,0.0000]; canvas.NDStyles["Airbus"] = { font_mapper: func(family, weight) { - return "ECAMFontRegular.ttf"; + return "ECAMFontBold100em.ttf"; }, # where all the symbols are stored diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index 2b501d28..a89c0343 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -100,7 +100,7 @@ var canvas_pfd = { obj.mismatch = obj.canvas.createGroup(); obj.font_mapper = func(family, weight) { - return "ECAMFontRegular.ttf"; + return "ECAMFontBold100em.ttf"; }; canvas.parsesvg(obj.group, svg, {"font-mapper": obj.font_mapper} ); diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas index 7e578464..02882117 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas @@ -48,7 +48,7 @@ var canvas_upperECAM = { obj.typeString = type; obj.font_mapper = func(family, weight) { - return "ECAMFontRegular.ttf"; + return "ECAMFontBold100em.ttf"; }; canvas.parsesvg(obj.group, svg, {"font-mapper": obj.font_mapper} );