C2020-002 Logic to use either the Letter or A4 paper size

This commit is contained in:
2020-02-14 17:16:28 +00:00
parent 2234bde5e1
commit b41320ed24
15 changed files with 111 additions and 47 deletions

View File

@@ -357,7 +357,7 @@ namespace Volian.Print.Library
if (myPageHelper.BottomContent != null)
{
cb.MoveTo(0, (float)myPageHelper.BottomContent);
cb.LineTo(792, (float)myPageHelper.BottomContent);
cb.LineTo(PDFPageSize.PaperSizePoints(MySection.ActiveFormat.PlantFormat.FormatData.PDFPageSize.PaperSize), (float)myPageHelper.BottomContent); // C2020-002 paper size is now set in the format files
}
int i = 0;
for (float y = yBottom; y <= yTop; y += 12)
@@ -715,7 +715,7 @@ i = 0;
float tmp = 0;
if (NotesToFootNotes != null && NotesToFootNotes.Count > 0)
{
float _PointsPerPage = 792;
float _PointsPerPage = (float)PDFPageSize.PaperSizePoints(MySection.ActiveFormat.PlantFormat.FormatData.PDFPageSize.PaperSize); // C2020-002 paper size is now set in the format files
float yTopMargin = _PointsPerPage - (float)MySection.MyDocStyle.Layout.TopMargin;
float myYOff = NotesToFootNotesYoffset;
foreach (vlnParagraph ntfn in NotesToFootNotes)
@@ -1397,7 +1397,7 @@ i = 0;
//token = Regex.Replace(token, @"[\xB3-\xDF]", " ");
// handle any conditional PS tokens
if (plstr.Contains(@"PS="))
if (token.Contains(@"PS="))
{
ProcedureConfig procConfig = new ProcedureConfig(section.MyProcedure.MyContent.Config);
if (procConfig != null)