From efd971ffec5261fb2aaf907f3c28defb1d9bcb89 Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 16 Apr 2015 13:05:36 +0000 Subject: [PATCH] Set page number on sections for transitions (with page num) to sections Always print hls boxit steps --- PROMS/Volian.Print.Library/PromsPrinter.cs | 2 ++ PROMS/Volian.Print.Library/vlnParagraph.cs | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index 244baf25..55d6d8f6 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -806,6 +806,8 @@ namespace Volian.Print.Library } public void CreateWordDocPdf(PdfContentByte cb, SectionInfo mySection) { + if (mySection.PageNumber == 0) // If page num transition goes to a section, need the pagenumber of section. + mySection.PageNumber = _MyHelper.CurrentPageNumber; int profileDepth = ProfileTimer.Push(">>>> CreateWordDocPdf"); _MyHelper.MySection = mySection; try diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index c353ab6d..babf50ee 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -184,7 +184,8 @@ namespace Volian.Print.Library (childItemInfo.MyHeader == null && childItemInfo.MyPrevious.MyHeader != null || childItemInfo.MyHeader != null && childItemInfo.MyPrevious.MyHeader == null))) doSeparateBoxHdrChg = childItemInfo.MyPrevious.MyContent.Type != childItemInfo.MyContent.Type;//true; - if ((bxIndx ?? -1) != -1 && (bxIndex != bxIndx || childItemInfo.FormatStepData.BoxIt || childItemInfo.MyHeader != null || doSeparateBoxHdrChg || childItemInfo.FormatStepData.SeparateBox)) + bool alwaysBox = (childItemInfo.IsHigh && childItemInfo.FormatStepData.BoxIt); + if ((alwaysBox || (bxIndx ?? -1) != -1) && (bxIndex != bxIndx || childItemInfo.FormatStepData.BoxIt || childItemInfo.MyHeader != null || doSeparateBoxHdrChg || childItemInfo.FormatStepData.SeparateBox)) { if (childItemInfo.FormatStepData.BoxIt) // this is a boxed HLS {