diff --git a/src/EPPlus.Fonts.OpenType/GenericFontWidths/FontMetricsFamilies.cs b/src/EPPlus.Fonts.OpenType/GenericFontWidths/FontMetricsFamilies.cs index 358d2af819..98617c1b30 100644 --- a/src/EPPlus.Fonts.OpenType/GenericFontWidths/FontMetricsFamilies.cs +++ b/src/EPPlus.Fonts.OpenType/GenericFontWidths/FontMetricsFamilies.cs @@ -43,5 +43,6 @@ internal enum FontMetricsFamilies : ushort AptosDisplay = 27, SegoeUI = 28, Tahoma = 29, + Consolas = 30, } } diff --git a/src/EPPlus.Fonts.OpenType/GenericFontWidths/FontScaleFactors.cs b/src/EPPlus.Fonts.OpenType/GenericFontWidths/FontScaleFactors.cs index 728e7d7c79..e50fca7e3a 100644 --- a/src/EPPlus.Fonts.OpenType/GenericFontWidths/FontScaleFactors.cs +++ b/src/EPPlus.Fonts.OpenType/GenericFontWidths/FontScaleFactors.cs @@ -178,6 +178,11 @@ private void Initialize() _fonts.Add(GetKey(FontMetricsFamilies.TwCenMTCondensed, FontSubFamilies.Bold), CSF(1.38f, 1.34f, 1.21f, 1.2f)); _fonts.Add(GetKey(FontMetricsFamilies.TwCenMTCondensed, FontSubFamilies.Italic), CSF(1.10f, 1.09f, 1.10f, 1.2f)); _fonts.Add(GetKey(FontMetricsFamilies.TwCenMTCondensed, FontSubFamilies.BoldItalic), CSF(1.38f, 1.32f, 1.2f, 1.2f)); + + _fonts.Add(GetKey(FontMetricsFamilies.Consolas, FontSubFamilies.Regular), CSF(1.10f, 1.10f, 1.10f)); + _fonts.Add(GetKey(FontMetricsFamilies.Consolas, FontSubFamilies.Bold), CSF(1.13f, 1.13f, 1.13f)); + _fonts.Add(GetKey(FontMetricsFamilies.Consolas, FontSubFamilies.Italic), CSF(1.13f, 1.13f, 1.13f)); + _fonts.Add(GetKey(FontMetricsFamilies.Consolas, FontSubFamilies.BoldItalic), CSF(1.13f, 1.13f, 1.13f)); } public float GetScaleFactor(uint key, float width) diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetric_old2s.zip b/src/EPPlus.Fonts.OpenType/Resources/TextMetric_old2s.zip deleted file mode 100644 index 43c9c65e66..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetric_old2s.zip and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics.zip b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics.zip index 86515c1cc8..fe2ea046df 100644 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics.zip and b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics.zip differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/0.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/0.fmtr deleted file mode 100644 index e392211472..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/0.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1.fmtr deleted file mode 100644 index aff0d972c2..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1048576.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1048576.fmtr deleted file mode 100644 index d1ff789559..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1048576.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1114112.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1114112.fmtr deleted file mode 100644 index 56eaf74521..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1114112.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1114113.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1114113.fmtr deleted file mode 100644 index fc91661919..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1114113.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1114114.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1114114.fmtr deleted file mode 100644 index 0ea22635ff..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1114114.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1114115.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1114115.fmtr deleted file mode 100644 index 4fe4c64b42..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1114115.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1179648.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1179648.fmtr deleted file mode 100644 index f5695b853c..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1179648.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1179649.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1179649.fmtr deleted file mode 100644 index f35d180bc4..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1179649.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1179650.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1179650.fmtr deleted file mode 100644 index 6e2a7638b0..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1179650.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1179651.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1179651.fmtr deleted file mode 100644 index 8535c7f7e5..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1179651.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1245184.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1245184.fmtr deleted file mode 100644 index 751e695aad..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1245184.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1245185.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1245185.fmtr deleted file mode 100644 index 9b49d11d66..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1245185.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/131072.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/131072.fmtr deleted file mode 100644 index 3cd7822f14..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/131072.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1310720.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1310720.fmtr deleted file mode 100644 index 6a76ec3ca8..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1310720.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1310721.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1310721.fmtr deleted file mode 100644 index 7f0305fd2f..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1310721.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1310722.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1310722.fmtr deleted file mode 100644 index 4101e80c83..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1310722.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1310723.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1310723.fmtr deleted file mode 100644 index 2745ce7064..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1310723.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/131073.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/131073.fmtr deleted file mode 100644 index 6b179e1216..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/131073.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/131074.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/131074.fmtr deleted file mode 100644 index 7713af7297..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/131074.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/131075.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/131075.fmtr deleted file mode 100644 index d16e41344a..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/131075.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1376256.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1376256.fmtr deleted file mode 100644 index cb44f88dc2..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1376256.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1376257.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1376257.fmtr deleted file mode 100644 index cb60249559..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1376257.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1376258.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1376258.fmtr deleted file mode 100644 index 82bb52c575..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1376258.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1376259.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1376259.fmtr deleted file mode 100644 index 9765a5628e..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1376259.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1441792.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1441792.fmtr deleted file mode 100644 index 9456aa8627..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1441792.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1441793.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1441793.fmtr deleted file mode 100644 index c88a6315db..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1441793.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1441794.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1441794.fmtr deleted file mode 100644 index ee83d59904..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1441794.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1441795.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1441795.fmtr deleted file mode 100644 index 9d0e72de17..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1441795.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1507328.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1507328.fmtr deleted file mode 100644 index 0f93acfb67..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1507328.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1507329.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1507329.fmtr deleted file mode 100644 index 90ef467ed0..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1507329.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1572864.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1572864.fmtr deleted file mode 100644 index 1f47edf3a2..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1572864.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1572865.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1572865.fmtr deleted file mode 100644 index 90c973f31b..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1572865.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1572866.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1572866.fmtr deleted file mode 100644 index afa6e978b7..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1572866.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1572867.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1572867.fmtr deleted file mode 100644 index 1192f66681..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1572867.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1638400.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1638400.fmtr deleted file mode 100644 index c1413a4f63..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1638400.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1638401.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1638401.fmtr deleted file mode 100644 index 89743b351e..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1638401.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1638402.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1638402.fmtr deleted file mode 100644 index f43ca8b157..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1638402.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1638403.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1638403.fmtr deleted file mode 100644 index 035f5b36b0..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1638403.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1703936.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1703936.fmtr deleted file mode 100644 index fe103b8a8a..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1703936.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1703937.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1703937.fmtr deleted file mode 100644 index ec629cbde1..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1703937.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1703938.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1703938.fmtr deleted file mode 100644 index 2ec6d8ebfe..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1703938.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1703939.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1703939.fmtr deleted file mode 100644 index 7193fb3f62..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1703939.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1769472.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1769472.fmtr deleted file mode 100644 index 4f57df534d..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1769472.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1769473.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1769473.fmtr deleted file mode 100644 index f34940780e..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1769473.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1769474.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1769474.fmtr deleted file mode 100644 index f3463bcb43..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1769474.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1769475.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1769475.fmtr deleted file mode 100644 index 8d6c071a09..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1769475.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1835008.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1835008.fmtr deleted file mode 100644 index 0e7648d6ea..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1835008.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1835009.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1835009.fmtr deleted file mode 100644 index 2c934ff0a4..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1835009.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1835010.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1835010.fmtr deleted file mode 100644 index 3042604cff..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1835010.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1835011.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1835011.fmtr deleted file mode 100644 index 7c8c6cc2f7..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1835011.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1900544.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1900544.fmtr deleted file mode 100644 index 3fccefca64..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1900544.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1900545.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1900545.fmtr deleted file mode 100644 index 09cbb915c8..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/1900545.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/196608.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/196608.fmtr deleted file mode 100644 index bd35c0a96f..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/196608.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/196609.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/196609.fmtr deleted file mode 100644 index c75bd3cbff..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/196609.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/196610.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/196610.fmtr deleted file mode 100644 index b9baa07cab..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/196610.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/196611.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/196611.fmtr deleted file mode 100644 index e73d015a95..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/196611.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/2.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/2.fmtr deleted file mode 100644 index 3af5c8155b..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/2.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/262144.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/262144.fmtr deleted file mode 100644 index 6cd5108861..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/262144.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/262145.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/262145.fmtr deleted file mode 100644 index 98413a1877..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/262145.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/262146.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/262146.fmtr deleted file mode 100644 index 1bfd6a026f..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/262146.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/262147.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/262147.fmtr deleted file mode 100644 index 7afcda303d..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/262147.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/3.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/3.fmtr deleted file mode 100644 index 6650a6de54..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/3.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/327680.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/327680.fmtr deleted file mode 100644 index 181c5857e3..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/327680.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/327682.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/327682.fmtr deleted file mode 100644 index 66937d4d72..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/327682.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/393216.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/393216.fmtr deleted file mode 100644 index 48966c12d1..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/393216.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/393217.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/393217.fmtr deleted file mode 100644 index a0d41780ea..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/393217.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/393218.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/393218.fmtr deleted file mode 100644 index 084b45fccc..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/393218.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/393219.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/393219.fmtr deleted file mode 100644 index 838a45e51d..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/393219.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/458752.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/458752.fmtr deleted file mode 100644 index 9eba416d4a..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/458752.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/458753.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/458753.fmtr deleted file mode 100644 index c44f36f907..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/458753.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/458754.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/458754.fmtr deleted file mode 100644 index 6032594879..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/458754.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/458755.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/458755.fmtr deleted file mode 100644 index 25ea2fa020..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/458755.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/589824.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/589824.fmtr deleted file mode 100644 index a31ecb9d69..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/589824.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/589825.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/589825.fmtr deleted file mode 100644 index 7a1fa865ee..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/589825.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/589826.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/589826.fmtr deleted file mode 100644 index c29731c5a5..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/589826.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/589827.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/589827.fmtr deleted file mode 100644 index 9bb86e9444..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/589827.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/65536.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/65536.fmtr deleted file mode 100644 index bb985c8c84..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/65536.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/655360.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/655360.fmtr deleted file mode 100644 index 09ee5f8cff..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/655360.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/655361.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/655361.fmtr deleted file mode 100644 index 0d1b59a3dc..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/655361.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/655362.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/655362.fmtr deleted file mode 100644 index da03576e91..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/655362.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/655363.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/655363.fmtr deleted file mode 100644 index 4e44d78518..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/655363.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/720896.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/720896.fmtr deleted file mode 100644 index de6778c973..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/720896.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/720897.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/720897.fmtr deleted file mode 100644 index e7f8712020..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/720897.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/720898.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/720898.fmtr deleted file mode 100644 index cd4a4a6c4c..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/720898.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/720899.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/720899.fmtr deleted file mode 100644 index 3484f02247..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/720899.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/786432.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/786432.fmtr deleted file mode 100644 index cf24646cfa..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/786432.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/786433.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/786433.fmtr deleted file mode 100644 index 66ed0cba27..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/786433.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/786434.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/786434.fmtr deleted file mode 100644 index bc5b4bfb11..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/786434.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/786435.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/786435.fmtr deleted file mode 100644 index e2a32334b0..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/786435.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/851968.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/851968.fmtr deleted file mode 100644 index 7245b57e32..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/851968.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/851969.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/851969.fmtr deleted file mode 100644 index 8fdf5981b4..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/851969.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/851970.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/851970.fmtr deleted file mode 100644 index 1c5044bb70..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/851970.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/917504.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/917504.fmtr deleted file mode 100644 index a19fd16364..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/917504.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/917505.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/917505.fmtr deleted file mode 100644 index 85f39f0d3d..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/917505.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/917506.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/917506.fmtr deleted file mode 100644 index aadfaba1a0..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/917506.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/917507.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/917507.fmtr deleted file mode 100644 index 649396cfe5..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/917507.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/983040.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/983040.fmtr deleted file mode 100644 index 0ffd2b58ab..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/983040.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/983041.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/983041.fmtr deleted file mode 100644 index f4c48ff656..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/983041.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/983042.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/983042.fmtr deleted file mode 100644 index 369e1a70ed..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/983042.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/983043.fmtr b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/983043.fmtr deleted file mode 100644 index 7f81900517..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics/983043.fmtr and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics_old.zip b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics_old.zip deleted file mode 100644 index c5e2ef39e6..0000000000 Binary files a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics_old.zip and /dev/null differ diff --git a/src/EPPlus.Fonts.OpenType/Resources/TextMetrics_old1.zip b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics_old1.zip new file mode 100644 index 0000000000..86515c1cc8 Binary files /dev/null and b/src/EPPlus.Fonts.OpenType/Resources/TextMetrics_old1.zip differ diff --git a/src/EPPlusTest/Core/Worksheet/AutofitWithSerializedFontMetricsTests.cs b/src/EPPlusTest/Core/Worksheet/AutofitWithSerializedFontMetricsTests.cs index f08c29e808..b6583b83cd 100644 --- a/src/EPPlusTest/Core/Worksheet/AutofitWithSerializedFontMetricsTests.cs +++ b/src/EPPlusTest/Core/Worksheet/AutofitWithSerializedFontMetricsTests.cs @@ -61,6 +61,7 @@ public class AutofitWithSerializedFontMetricsTests : TestBase [DataRow("Tw Cen MT Condensed")] [DataRow("Segoe UI")] [DataRow("Tahoma")] + [DataRow("Consolas")] public void AutofitWithSerializedFonts(string fontFamily) { var columns = AutofitCorpus.GetLength(0);