From 1129cb343126c023511984db0e535da212e25acb Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 4 Nov 2014 16:48:26 +0000 Subject: [PATCH] =?UTF-8?q?Adjust=20landscape=20word=20section=20pagelist?= =?UTF-8?q?=20item=20locations=20&=20flags=20for=20printing=20pagelist=20i?= =?UTF-8?q?tems=20as=20landscape=20Calvert:=20Added=20=E2=80=98DSS=5FPageL?= =?UTF-8?q?istAddSectCont=E2=80=99=20flag=20to=20docstyle->Style=20to=20fl?= =?UTF-8?q?ag=20continue=20message=20in=20section=20title=20Calvert:=20Res?= =?UTF-8?q?et=20svg=E2=80=99s=20for=20document=20styles=20that=20have=20?= =?UTF-8?q?=E2=80=98DSS=5FPageListAddSectCont=E2=80=99=20so=20that=20pages?= =?UTF-8?q?=20other=20than=20first=20have=20continue=20message=20Calvert:?= =?UTF-8?q?=20Print=20continue=20message=20for=20=E2=80=9CATTACHTITLECONT?= =?UTF-8?q?=E2=80=9D=20pagelist=20item=20(but=20not=20on=201st=20page)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/BGESTPall.xml | Bin 149300 -> 149414 bytes PROMS/VEPROMS.CSLA.Library/Format/ENums.cs | 1 + PROMS/Volian.Print.Library/PromsPrinter.cs | 13 +++++++++++++ .../Volian.Print.Library/VlnSvgPageHelper.cs | 9 ++++++++- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/BGESTPall.xml b/PROMS/Formats/fmtall/BGESTPall.xml index 8aab31ae966b1d1de6bd56c5da2a258ea6d52ae1..7f8722b087625e417645e4076e2eb8241864057e 100644 GIT binary patch delta 239 zcmdne$GNPZvtbLP-#1oM21^Fh=@%z5-komnozVuu-(L8gQIwIBaPUTuedR9bB2F zFitA)V!VnCE@fapJ0?khW%A^AAC}D7B$Oqb3GX0|fQ}Xl$s~JVM7icpbkp=)9 Cyh26* delta 148 zcmZ41&$*?KvtbLP-#2Cx28-!}D;V!jH~7wI1LHlM9`J+FjL~v?Vk@IIBcsK3pbBor z?fZT)<}opvPnX}s_;`B3Rz^2Q%jrNB@2B%^W{hA2n{#;DR7Sb24NPI`)62dv@=af0 u&a`g&1U)8|=@%TB6sB`%GC6G*(PuJXn(iRTBr<)$YDSUmkF=SNNCN-|D>7aH diff --git a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs index 790f8c8c..1b1ba6a1 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs @@ -167,6 +167,7 @@ namespace VEPROMS.CSLA.Library DSS_SimpleTopSectionContinue = 0x80000000, // Use the Top continue message as the section continue */ DSS_DontDoCheckOffs = 0x100000000, // format has checkoffs, but don't do for this section DSS_PageListSpBckgrnd = 0x200000000, // this background document style has special formatting: margins, title with cont and non underlined header (IP2BCK) + DSS_PageListAddSectCont = 0x400000000, // for this section, add the top continue message when doing the ATTACHTITLECONT pagelist token (Calvert/Landscape word docs) }; public enum E_DocStyleUse : uint { diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index 18d05551..38cb0a16 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -667,6 +667,7 @@ namespace Volian.Print.Library } } float origYoff = (float)mySection.MyDocStyle.Layout.TopMargin; + bool resetSvgForCont = true; for (int ii = 0; ii < sectPageCount; ii++) { int pageNumber = 1 + ii; @@ -737,6 +738,18 @@ namespace Volian.Print.Library // if this document style has another style that is for pages other than first, we need to // reset the document style off of this section AND reset docstyle values used. _MyHelper.DidFirstPageDocStyle = true; + + // Calvert has a case in their stp landscape word docs where a ' (Continued)' message + // appears in their pagelist item for printing the section title, {ATTACHTITLECONT} pagelist + // However, other sections use this token, but do NOT have the continue message - so + // the docstyle was added to flag the difference between them (STP-Landscape Attachments has it, + // STP-Attachments do not) + if (resetSvgForCont && (mySection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListAddSectCont) == E_DocStructStyle.DSS_PageListAddSectCont) + { + _MyHelper.ResetSvg(); + resetSvgForCont = false; // only need to reset it once (for all pages after 1st page) + } + //DebugPagination.WriteLine("CreateWordDocPdf"); if ((mySection.MyDocStyle.StructureStyle.Where & E_DocStyleUse.UseOnFirstPage) > 0) _MyHelper.MySection = mySection; // this resets the docstyle/pagestyle in pagehelper diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index c503002b..f85ccde1 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1488,7 +1488,14 @@ namespace Volian.Print.Library } if (printsectlevel) { - plstr = SplitTitle(svgGroup, pageItem, section.DisplayText, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionTitleLength, token, plstr); + string stitle = section.DisplayText; + if (((section.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListAddSectCont) == E_DocStructStyle.DSS_PageListAddSectCont) + && token.Contains("ATTACHTITLECONT") && DidFirstPageDocStyle) + { + string myMsg = section.MyDocStyle.Continue.Top.Message; + if (myMsg != null && myMsg != "")stitle = stitle + myMsg; + } + plstr = SplitTitle(svgGroup, pageItem, stitle, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionTitleLength, token, plstr); PrintedSectionPage = (int)pageItem.Row - _sectLevelNumTtlDiff; } else