diff --git a/PROMS/Volian.Utils.Library/CvtFont/CvtFont.cs b/PROMS/Volian.Utils.Library/CvtFont/CvtFont.cs index 2719848e..6d0db057 100644 --- a/PROMS/Volian.Utils.Library/CvtFont/CvtFont.cs +++ b/PROMS/Volian.Utils.Library/CvtFont/CvtFont.cs @@ -196,6 +196,35 @@ namespace CvtFont 8 //VOLIANSCRIPT?? }; private static float[] CPIS = { + 12, // ELITE + 10, // PICA + 16.66F, // LN_PRN + 16.665F, // CONDENSE + 12, // SANSERIF + 10, // PICA12 + 10, // PROPORTIONAL + 10, // PROPT12 + 12, // HVLPT18 + 12, // HVLPT25 + 10, // SPECIALCHARS + 10, // PT14 + 12, // SANSERIF14 + 12, // SANSERIF17 + 12, // HVLPT12 + 10, // NARRATOR + 16.67F, // MEDUPUNIVERS - medium upright univers fonts (HP3 internal) + 16.67F, // LGUPMED16 - Letter Gothic Upright Medium 16.67 + 12, // PT12BOLD + 12.50F, // LG1275HP4SI + 10, // HVLPT10 + 8, // HVLPT8 + 14, // HVLP14 + 12, // SANSERIF25 + 8, // EYECHART + 12, // TIMES11 + 16.665F // SANSCOND + }; + private static float[] CPISBadPICA12 = { 12, // ELITE 10, // PICA 16.66F, // LN_PRN @@ -287,6 +316,14 @@ namespace CvtFont return CPIS[0]; return CPIS[j]; } + public static float GetCPISBadPICA12(uint i) + { + if (FontIsPropt(i)) return 12; + uint j = i & 63; + if (j > CPISBadPICA12.Length - 1) + return CPISBadPICA12[0]; + return CPISBadPICA12[j]; + } public static float GetPrintPitch(uint i) { if (FontIsPropt(i)) return 12;