From c16cbd0978d9be4e52f855133f63e9fa8dfaea47 Mon Sep 17 00:00:00 2001 From: Chris Glavan Date: Mon, 21 Aug 2023 16:17:37 -0400 Subject: [PATCH 1/5] F2023-127: Adjusted top margin for deleted procedures. **NOTE** - User must uncheck box to use Word margins in order for this to be in effect. --- PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 200104 -> 200106 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index e70869aee395fdb6190a58d1a163af8a1a312a05..2b83eb8831f2c29887d145d608b2885b1431dccb 100644 GIT binary patch delta 26 icmZ26n`hN*o`x327N#xCVLa0lzA?FNpT)z>#|Qw2<_PHk delta 30 mcmZ2An`gyro`x327N#xCVLZ&{45rf^A2B&@pTon<#|QwRs0ktf From ac8f56c85e82ba703ffabcaca04e0be13e13689a Mon Sep 17 00:00:00 2001 From: Chris Glavan Date: Mon, 21 Aug 2023 16:17:37 -0400 Subject: [PATCH 2/5] F2023-127: Adjusted top margin for deleted procedures. **NOTE** - User must uncheck box to use Word margins in order for this to be in effect. --- PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 200580 -> 200582 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index dcc2c0f3b6feb6a0f4aac2a366fcf6f5d3fd4dd3..37be0cecc90a1d87601c3f6469dcb7c695bcd434 100644 GIT binary patch delta 30 mcmZpf&(k)ar=f+hg=q`35#RI=oXl#IKPa Date: Tue, 22 Aug 2023 08:43:56 -0400 Subject: [PATCH 3/5] F2023-122: Corrected wording of the bottom continued message --- PROMS/Formats/fmtall/VEGP2all.xml | Bin 182322 -> 182492 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 8252e78400b0a05dccf1c3bb48c7b8467d3c36b4..bd384db68312a749320a51a397ac2acbdd3f8d7d 100644 GIT binary patch delta 124 zcmdlqf&0!x?uHh|ElhQ@COdGkaXT^OGn4>fK11&G^#_?Gje{9N7+e_w7!(+s8T=Xi zfILqi844700gCwn=?I{h0#Jn`gFBF?z@R%_{y38;yCH)KgAs$$g@~Y5`Nm_E)o*JahqVHXg44 delta 23 fcmcaJk$ckw?uHh|ElhQ@rY&U3**;}9lZP$ Date: Tue, 22 Aug 2023 08:46:07 -0400 Subject: [PATCH 4/5] B2023-088: Vogtle Alarm pagination issues --- PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 200104 -> 200242 bytes .../Format/PlantFormat.cs | 9 +++++++ PROMS/Volian.Print.Library/Pagination.cs | 6 ++++- PROMS/Volian.Print.Library/vlnParagraph.cs | 24 +++++++++++++----- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index e70869aee395fdb6190a58d1a163af8a1a312a05..50bd229a0f7e502746002558c3fb3f0b282ec8cf 100644 GIT binary patch delta 164 zcmZ26n`hG;o(&y3;tC9o3^@#m3`GpN3;{qoogtGUk0Eio{VgW(>AyBG@=X^w$jH(> zOQ(I74&(M&I!v23O8YV7Gx#%!sLZ|(N4&(L{I!v23PPcf)D6##(Jth}5FmpPP X88dytb0)Uw7k)FzY(K%uoW%hE=#LzF diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 879952fe..b35ee527 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -4303,6 +4303,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PaginateOnLowerStepLevel, "@PaginateOnLowerStepLevel"); } } + // B2023-088: alarm format pagination + private LazyLoad _AlarmPagination; + public bool AlarmPagination + { + get + { + return LazyLoad(ref _AlarmPagination, "@AlarmPagination"); + } + } private LazyLoad _CustomSpacing; public bool CustomSpacing { diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index 2633b070..78c01396 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -1565,7 +1565,7 @@ namespace Volian.Print.Library float yAddForBtmMsg = 0; // useful for debugging pagination issues, lastbreak gets the paragraph at the top of the previous page, shows all // of the locations within 'range' on the next page. - //if (lastBreak != null && lastBreak.MyItemInfo.InList(72481)) + //if (lastBreak != null && lastBreak.MyItemInfo.InList(72481)) //{ // int range = 120; // Console.WriteLine("lastBreak = {0}, {1}", yUpperLimit, lastBreak); @@ -1720,7 +1720,11 @@ namespace Volian.Print.Library { vlnParagraph rnoChild = myPara.HasSecondRNOThatWillFit(yStart, yLowerLimit, yUpperLimit, myList, stepLevel, yTop); // Only if it is more than the lower limit if (rnoChild != null) + { + // B2023-088: don't return the 'rnochild' if this is a caution or note in an alarm format + if (myPara.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.AlarmPagination && minPara2 != null && minPara2.MyItemInfo.IsCautionOrNotePart) return minPara2; return rnoChild; + } } // B2019-103, B2019-114 Break at a step if the step will fit on a page by itself and it will // not fit in the current page diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 466a61b2..f9d8f6f4 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -7088,13 +7088,25 @@ namespace Volian.Print.Library { // B2020-116: change from checking for type 20001 to looking for a non-high sequential since some // step types were sequential but not 20001 - if (!paraLoc.MyParagraph.MyItemInfo.IsHigh && paraLoc.MyParagraph.MyItemInfo.IsSequential) + bool keepBullettedTogether = paraLoc.MyParagraph.MyItemInfo.IsSubStep; + if (!paraLoc.MyParagraph.MyItemInfo.IsHigh) { - if (DontBreakHere(paraLoc)) - //if (paraLoc.MyParagraph.MyItemInfo.MyPrevious == null) // First substep - level = 0; - else - level = 1; + bool AlarmPagination = paraLoc.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.AlarmPagination; + if (paraLoc.MyParagraph.MyItemInfo.IsSequential) + { + if (DontBreakHere(paraLoc)) + //if (paraLoc.MyParagraph.MyItemInfo.MyPrevious == null) // First substep + level = 0; + else + level = AlarmPagination?3:1; // B2023-088 make it easier to break on a sequential for alarms + } + else if (AlarmPagination && paraLoc.MyParagraph.MyItemInfo.IsSubStep) + { + // make it harder to break on first caution or note & within a list if doing Alarm Pagination: + vlnParagraph myPara = paraLoc.MyParagraph; + if ((myPara.MyItemInfo.IsCaution || myPara.MyItemInfo.IsNote) && myPara.MyItemInfo.MyPrevious == null) level = 1; + else if (myPara.MyItemInfo.MyPrevious != null || myPara.MyItemInfo.NextItem != null) level = 2; + } } } // For B2015-014, some migrated data for background documents had the TitleWithTextBelow with associated paragraphs From ba5e76edae077d6b410b732f49ddf9122939397f Mon Sep 17 00:00:00 2001 From: John Jenko Date: Tue, 22 Aug 2023 14:09:59 -0400 Subject: [PATCH 5/5] F2023-130 Vogtle ReplaceWords - don't bold \Check --- PROMS/Formats/fmtall/VEGP1all.xml | Bin 169258 -> 169746 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 182492 -> 182980 bytes PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 200720 -> 201214 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index 1c4fe3c677e76e87349534fc2434734dc5ce944b..36d0c590f14fe0aaf837c5f2d80b3911db58c9ae 100644 GIT binary patch delta 58 zcmZ3rifht3t_^&}jQW##i#6Hx8Jrn17*Z$8rygZYp3GmY4irg-iX3j{D{cp>+|F0b HB%=fX1`!a= delta 22 ecmbQVj%(E_t_^&}&EHDezm+g<|5m~zqXYnZ4hk9o diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index bd384db68312a749320a51a397ac2acbdd3f8d7d..9374cb0f55cc2bb0778f1b39431705e8a6edb349 100644 GIT binary patch delta 60 zcmcaJk^9J0?hR7OjQW%9-)pk#GdMG3Fr-eF4?E1P&yYOX@x3}wEEy)&ES202RJ&a& Indwj}09hszM*si- delta 22 ecmX>ymHW;_?hR7O%}lB7OsS09nNpb!r2+tEs0b0NMZkqYRLs46w9bla^pkli*^kla^sjlh9|bgO*~4mSO?7mSO^EuY&Ir6#xJL