From 7f899175d1ab4f484d8cb72e8ebc3d037bfff486 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Fri, 26 Jul 2024 14:54:11 -0400 Subject: [PATCH] C2024-017 Removed old (not implemented) format variables and settings from the format files and removed incomplete references to them in the C# code. Also added descriptions of the used format variables in the C# code that hooks the XML format files to the PROMS C# logic. --- PROMS/Formats/fmtall/AEPAPPRall.xml | Bin 32234 -> 30888 bytes PROMS/Formats/fmtall/AEPCHID_00all.xml | Bin 28960 -> 28404 bytes PROMS/Formats/fmtall/AEPCHIDall.xml | Bin 70546 -> 69220 bytes PROMS/Formats/fmtall/AEPDEVall.xml | Bin 29790 -> 28940 bytes PROMS/Formats/fmtall/AEPSAMGFPall.xml | Bin 74444 -> 73070 bytes PROMS/Formats/fmtall/AEPSAMG_01all.xml | Bin 24280 -> 23720 bytes PROMS/Formats/fmtall/AEPSAMG_02all.xml | Bin 25320 -> 24760 bytes PROMS/Formats/fmtall/AEPSAMGall.xml | Bin 73970 -> 72596 bytes PROMS/Formats/fmtall/AEP_00all.xml | Bin 28974 -> 28366 bytes PROMS/Formats/fmtall/AEP_01all.xml | Bin 27626 -> 27066 bytes PROMS/Formats/fmtall/AEP_02all.xml | Bin 28662 -> 28102 bytes PROMS/Formats/fmtall/AEPall.xml | Bin 70850 -> 69532 bytes PROMS/Formats/fmtall/BASEall.xml | Bin 101508 -> 93418 bytes PROMS/Formats/fmtall/BGEALNall.xml | Bin 112130 -> 110584 bytes PROMS/Formats/fmtall/BGEEOP_00all.xml | Bin 31582 -> 31012 bytes PROMS/Formats/fmtall/BGEEOPall.xml | Bin 98526 -> 95848 bytes PROMS/Formats/fmtall/BGEOI_00all.xml | Bin 114428 -> 113648 bytes PROMS/Formats/fmtall/BGEOIall.xml | Bin 141348 -> 139174 bytes PROMS/Formats/fmtall/BGESAM1all.xml | Bin 99030 -> 96404 bytes PROMS/Formats/fmtall/BGESTPall.xml | Bin 151228 -> 148916 bytes PROMS/Formats/fmtall/BGEVLall.xml | Bin 50296 -> 48800 bytes PROMS/Formats/fmtall/BNPP1Newall.xml | Bin 230790 -> 228100 bytes PROMS/Formats/fmtall/BNPP1all.xml | Bin 187274 -> 184796 bytes PROMS/Formats/fmtall/BNPP2all.xml | Bin 199814 -> 198526 bytes PROMS/Formats/fmtall/BNPPalrall.xml | Bin 238474 -> 236750 bytes PROMS/Formats/fmtall/BNPPbckall.xml | Bin 166626 -> 163138 bytes PROMS/Formats/fmtall/BNPPsamall.xml | Bin 171756 -> 170438 bytes PROMS/Formats/fmtall/BVPS1all.xml | Bin 133368 -> 131200 bytes PROMS/Formats/fmtall/BVPS2all.xml | Bin 99170 -> 97172 bytes PROMS/Formats/fmtall/BVPSAOPDEVall.xml | Bin 42192 -> 41426 bytes PROMS/Formats/fmtall/BVPSAOPall.xml | Bin 150832 -> 148552 bytes PROMS/Formats/fmtall/BVPSAtchall.xml | Bin 128398 -> 126230 bytes PROMS/Formats/fmtall/BVPSBCKall.xml | Bin 75904 -> 73366 bytes PROMS/Formats/fmtall/BVPSDEVall.xml | Bin 42192 -> 41426 bytes PROMS/Formats/fmtall/BVPSFlexDEVall.xml | Bin 40456 -> 39690 bytes PROMS/Formats/fmtall/BVPSNIBCKall.xml | Bin 73956 -> 71420 bytes PROMS/Formats/fmtall/BVPSSAMGBCKall.xml | Bin 73006 -> 70520 bytes PROMS/Formats/fmtall/BVPSSAMGDEVall.xml | Bin 42198 -> 41432 bytes PROMS/Formats/fmtall/BVPSSAMGall.xml | Bin 129082 -> 126914 bytes PROMS/Formats/fmtall/CAL1all.xml | Bin 87016 -> 84350 bytes PROMS/Formats/fmtall/CAL2_00all.xml | Bin 59326 -> 58644 bytes PROMS/Formats/fmtall/CAL2all.xml | Bin 82602 -> 80958 bytes PROMS/Formats/fmtall/CALBCKall.xml | Bin 48782 -> 46406 bytes PROMS/Formats/fmtall/CALFSGBCKall.xml | Bin 48592 -> 46186 bytes PROMS/Formats/fmtall/CALOTOall.xml | Bin 78586 -> 76970 bytes PROMS/Formats/fmtall/CALSAMall.xml | Bin 83460 -> 81816 bytes PROMS/Formats/fmtall/CATADEVall.xml | Bin 31650 -> 30232 bytes PROMS/Formats/fmtall/CATBOXall.xml | Bin 63342 -> 61644 bytes PROMS/Formats/fmtall/CATDEVall.xml | Bin 24892 -> 24166 bytes PROMS/Formats/fmtall/CATEBCKall.xml | Bin 32584 -> 31208 bytes PROMS/Formats/fmtall/CATSAMall.xml | Bin 72492 -> 70742 bytes PROMS/Formats/fmtall/CATall.xml | Bin 63248 -> 61466 bytes PROMS/Formats/fmtall/CPBCK2NHCall.xml | Bin 35384 -> 33814 bytes PROMS/Formats/fmtall/CPBCK2all.xml | Bin 35374 -> 33804 bytes PROMS/Formats/fmtall/CPBCKNHC_00all.xml | Bin 23424 -> 23046 bytes PROMS/Formats/fmtall/CPBCKNHC_01all.xml | Bin 22638 -> 22260 bytes PROMS/Formats/fmtall/CPBCKNHCall.xml | Bin 57398 -> 55138 bytes PROMS/Formats/fmtall/CPBCK_00all.xml | Bin 23416 -> 23038 bytes PROMS/Formats/fmtall/CPBCK_01all.xml | Bin 22438 -> 22060 bytes PROMS/Formats/fmtall/CPBCKall.xml | Bin 57438 -> 55178 bytes PROMS/Formats/fmtall/CPDEVall.xml | Bin 32810 -> 32054 bytes PROMS/Formats/fmtall/CPFDEVall.xml | Bin 33428 -> 32722 bytes PROMS/Formats/fmtall/CPFDataall.xml | Bin 37460 -> 36528 bytes PROMS/Formats/fmtall/CPLAall.xml | Bin 59586 -> 58130 bytes PROMS/Formats/fmtall/CPLRDEVall.xml | Bin 25268 -> 24066 bytes PROMS/Formats/fmtall/CPLS2all.xml | Bin 61790 -> 60544 bytes PROMS/Formats/fmtall/CPLSAMall.xml | Bin 67726 -> 66094 bytes PROMS/Formats/fmtall/CPLSDEVall.xml | Bin 33786 -> 32960 bytes PROMS/Formats/fmtall/CPLSSDDall.xml | Bin 54088 -> 52648 bytes PROMS/Formats/fmtall/CPLSSUMall.xml | Bin 32896 -> 32070 bytes PROMS/Formats/fmtall/CPLSall.xml | Bin 64306 -> 63058 bytes PROMS/Formats/fmtall/CPL_00all.xml | Bin 51524 -> 50384 bytes PROMS/Formats/fmtall/CPL_01all.xml | Bin 51538 -> 50398 bytes PROMS/Formats/fmtall/CPL_02all.xml | Bin 51552 -> 50412 bytes PROMS/Formats/fmtall/CPL_03all.xml | Bin 22078 -> 20866 bytes PROMS/Formats/fmtall/CPLall.xml | Bin 69326 -> 67694 bytes PROMS/Formats/fmtall/CPSAMGDEVall.xml | Bin 27310 -> 26482 bytes PROMS/Formats/fmtall/CPSAMGDataall.xml | Bin 37152 -> 36220 bytes PROMS/Formats/fmtall/CWEDEVall.xml | Bin 24090 -> 23302 bytes PROMS/Formats/fmtall/CWER_00all.xml | Bin 30364 -> 29830 bytes PROMS/Formats/fmtall/CWER_01all.xml | Bin 30412 -> 29878 bytes PROMS/Formats/fmtall/CWERall.xml | Bin 54570 -> 53382 bytes PROMS/Formats/fmtall/CWE_00all.xml | Bin 32168 -> 31634 bytes PROMS/Formats/fmtall/CWE_01all.xml | Bin 32400 -> 31866 bytes PROMS/Formats/fmtall/CWEall.xml | Bin 60088 -> 58462 bytes PROMS/Formats/fmtall/ComPeakFlex11all.xml | Bin 71658 -> 69990 bytes PROMS/Formats/fmtall/ComPeakFlexall.xml | Bin 64268 -> 62588 bytes PROMS/Formats/fmtall/EBCKall.xml | Bin 32418 -> 31042 bytes PROMS/Formats/fmtall/EFSGBCKall.xml | Bin 34972 -> 33568 bytes PROMS/Formats/fmtall/ELFDEVall.xml | Bin 33664 -> 32264 bytes PROMS/Formats/fmtall/ENall.xml | Bin 39652 -> 38582 bytes PROMS/Formats/fmtall/ESFDEVall.xml | Bin 31742 -> 30324 bytes PROMS/Formats/fmtall/EXCLN_00all.xml | Bin 32562 -> 31984 bytes PROMS/Formats/fmtall/EXCLN_01all.xml | Bin 31910 -> 31376 bytes PROMS/Formats/fmtall/EXCLNall.xml | Bin 57494 -> 56240 bytes PROMS/Formats/fmtall/EXEAOPBCKall.xml | Bin 45442 -> 43178 bytes PROMS/Formats/fmtall/EXEBCK_00all.xml | Bin 30638 -> 30134 bytes PROMS/Formats/fmtall/EXEBCKall.xml | Bin 46200 -> 43936 bytes PROMS/Formats/fmtall/EXEDEVall.xml | Bin 33746 -> 32480 bytes PROMS/Formats/fmtall/EXEFLXBCKall.xml | Bin 45436 -> 43172 bytes PROMS/Formats/fmtall/EXESAMGBCKall.xml | Bin 46234 -> 43970 bytes PROMS/Formats/fmtall/EXESAMall.xml | Bin 73640 -> 71942 bytes PROMS/Formats/fmtall/EXP1all.xml | Bin 80858 -> 78292 bytes PROMS/Formats/fmtall/EXP2all.xml | Bin 83834 -> 82768 bytes PROMS/Formats/fmtall/FNPCASall.xml | Bin 15416 -> 14920 bytes PROMS/Formats/fmtall/FNPDEVall.xml | Bin 52674 -> 51354 bytes PROMS/Formats/fmtall/FNPEBKall.xml | Bin 39254 -> 37778 bytes PROMS/Formats/fmtall/FNPNew2all.xml | Bin 96258 -> 92846 bytes PROMS/Formats/fmtall/FNPSAM1all.xml | Bin 90332 -> 88280 bytes PROMS/Formats/fmtall/FNP_00all.xml | Bin 31096 -> 30620 bytes PROMS/Formats/fmtall/FNP_01all.xml | Bin 28428 -> 27986 bytes PROMS/Formats/fmtall/FNPall.xml | Bin 104928 -> 102680 bytes PROMS/Formats/fmtall/FPLBCKall.xml | Bin 42784 -> 40482 bytes PROMS/Formats/fmtall/FPLall.xml | Bin 47314 -> 46384 bytes PROMS/Formats/fmtall/GENDEVall.xml | Bin 23930 -> 23204 bytes PROMS/Formats/fmtall/GENPLANall.xml | Bin 24440 -> 23726 bytes PROMS/Formats/fmtall/GENSAM2all.xml | Bin 30060 -> 29126 bytes PROMS/Formats/fmtall/GENSAMall.xml | Bin 49810 -> 48636 bytes PROMS/Formats/fmtall/GENall.xml | Bin 43030 -> 41510 bytes PROMS/Formats/fmtall/GPCA_00all.xml | Bin 23080 -> 22218 bytes PROMS/Formats/fmtall/GPCAall.xml | Bin 44504 -> 42454 bytes PROMS/Formats/fmtall/GPCall.xml | Bin 44300 -> 42442 bytes PROMS/Formats/fmtall/GinnaAOPBck_00all.xml | Bin 23866 -> 22716 bytes PROMS/Formats/fmtall/GinnaAOPBckall.xml | Bin 40012 -> 38534 bytes PROMS/Formats/fmtall/GinnaAttall.xml | Bin 28612 -> 27276 bytes PROMS/Formats/fmtall/GinnaFSGPEall.xml | Bin 22378 -> 21672 bytes PROMS/Formats/fmtall/GinnaFSGall.xml | Bin 30858 -> 30100 bytes PROMS/Formats/fmtall/GinnaFSGbck_00all.xml | Bin 22858 -> 21708 bytes PROMS/Formats/fmtall/GinnaFSGbckall.xml | Bin 40158 -> 38680 bytes PROMS/Formats/fmtall/GinnaSAMGbck_00all.xml | Bin 22862 -> 21712 bytes PROMS/Formats/fmtall/GinnaSAMGbckall.xml | Bin 40974 -> 39256 bytes PROMS/Formats/fmtall/HLPDEVall.xml | Bin 43596 -> 42810 bytes PROMS/Formats/fmtall/HLPall.xml | Bin 85618 -> 84054 bytes PROMS/Formats/fmtall/IP2BCKall.xml | Bin 49792 -> 47862 bytes PROMS/Formats/fmtall/IP2DEVall.xml | Bin 26084 -> 25286 bytes PROMS/Formats/fmtall/IP2_00all.xml | Bin 31234 -> 30434 bytes PROMS/Formats/fmtall/IP2_01all.xml | Bin 24842 -> 23972 bytes PROMS/Formats/fmtall/IP2_02all.xml | Bin 29490 -> 28486 bytes PROMS/Formats/fmtall/IP2_03all.xml | Bin 25558 -> 24612 bytes PROMS/Formats/fmtall/IP2_04all.xml | Bin 29638 -> 28544 bytes PROMS/Formats/fmtall/IP2all.xml | Bin 52528 -> 51364 bytes PROMS/Formats/fmtall/IP3DEV_00all.xml | Bin 26688 -> 25824 bytes PROMS/Formats/fmtall/IP3DEVall.xml | Bin 24530 -> 23758 bytes PROMS/Formats/fmtall/IP3_00all.xml | Bin 33060 -> 32296 bytes PROMS/Formats/fmtall/IP3_01all.xml | Bin 26546 -> 25818 bytes PROMS/Formats/fmtall/IP3_02all.xml | Bin 25804 -> 25062 bytes PROMS/Formats/fmtall/IP3_03all.xml | Bin 68300 -> 67164 bytes PROMS/Formats/fmtall/IP3_06all.xml | Bin 28906 -> 28164 bytes PROMS/Formats/fmtall/IP3_07all.xml | Bin 33730 -> 32944 bytes PROMS/Formats/fmtall/IP3_08all.xml | Bin 36442 -> 35458 bytes PROMS/Formats/fmtall/IP3_09all.xml | Bin 33242 -> 32456 bytes PROMS/Formats/fmtall/IP3_10all.xml | Bin 25592 -> 24850 bytes PROMS/Formats/fmtall/IP3_11all.xml | Bin 30962 -> 30198 bytes PROMS/Formats/fmtall/IP3_12all.xml | Bin 25702 -> 24960 bytes PROMS/Formats/fmtall/IP3_13all.xml | Bin 25822 -> 25080 bytes PROMS/Formats/fmtall/IP3_14all.xml | Bin 28062 -> 27298 bytes PROMS/Formats/fmtall/IP3_15all.xml | Bin 33288 -> 32222 bytes PROMS/Formats/fmtall/IP3all.xml | Bin 31122 -> 30108 bytes PROMS/Formats/fmtall/MAINGall.xml | Bin 20604 -> 19848 bytes PROMS/Formats/fmtall/MCGBOXall.xml | Bin 66704 -> 64984 bytes PROMS/Formats/fmtall/MCGDEVall.xml | Bin 24892 -> 24166 bytes PROMS/Formats/fmtall/MCGEBCKall.xml | Bin 31916 -> 30540 bytes PROMS/Formats/fmtall/MCGSAMall.xml | Bin 72492 -> 70740 bytes PROMS/Formats/fmtall/MCGall.xml | Bin 67020 -> 65300 bytes PROMS/Formats/fmtall/NSPAB_00all.xml | Bin 30600 -> 29766 bytes PROMS/Formats/fmtall/NSPAB_01all.xml | Bin 29642 -> 28614 bytes PROMS/Formats/fmtall/NSPAB_02all.xml | Bin 26150 -> 24576 bytes PROMS/Formats/fmtall/NSPABall.xml | Bin 52978 -> 50870 bytes PROMS/Formats/fmtall/NSPARP_00all.xml | Bin 44080 -> 42934 bytes PROMS/Formats/fmtall/NSPARPall.xml | Bin 62730 -> 61066 bytes PROMS/Formats/fmtall/NSPBCKall.xml | Bin 23648 -> 22858 bytes PROMS/Formats/fmtall/NSPDEVall.xml | Bin 31256 -> 29958 bytes PROMS/Formats/fmtall/NSPEDEVall.xml | Bin 33068 -> 31808 bytes PROMS/Formats/fmtall/NSPFCall.xml | Bin 37748 -> 36798 bytes PROMS/Formats/fmtall/NSPIFG2all.xml | Bin 44994 -> 43338 bytes PROMS/Formats/fmtall/NSPIFG_00all.xml | Bin 31028 -> 30136 bytes PROMS/Formats/fmtall/NSPIFGall.xml | Bin 44714 -> 43166 bytes PROMS/Formats/fmtall/NSPPEall.xml | Bin 38490 -> 37172 bytes PROMS/Formats/fmtall/NSPSAMDEVall.xml | Bin 31266 -> 29968 bytes PROMS/Formats/fmtall/NSPSAMall.xml | Bin 61686 -> 60084 bytes PROMS/Formats/fmtall/NSPWGall.xml | Bin 19108 -> 18462 bytes PROMS/Formats/fmtall/NSP_00all.xml | Bin 20506 -> 19594 bytes PROMS/Formats/fmtall/NSPall.xml | Bin 61874 -> 59688 bytes PROMS/Formats/fmtall/OHLPall.xml | Bin 72380 -> 71110 bytes PROMS/Formats/fmtall/PROMSMan1all.xml | Bin 87878 -> 85094 bytes PROMS/Formats/fmtall/PROMSMan2all.xml | Bin 83832 -> 82766 bytes PROMS/Formats/fmtall/RGEBCK_00all.xml | Bin 23828 -> 22678 bytes PROMS/Formats/fmtall/RGEBCKall.xml | Bin 40726 -> 39248 bytes PROMS/Formats/fmtall/RGEDEVall.xml | Bin 23314 -> 22590 bytes PROMS/Formats/fmtall/RGESAM1all.xml | Bin 46030 -> 45020 bytes PROMS/Formats/fmtall/RGESAM2all.xml | Bin 28822 -> 28028 bytes PROMS/Formats/fmtall/RGESMPEall.xml | Bin 22436 -> 21732 bytes PROMS/Formats/fmtall/RGEall.xml | Bin 43986 -> 43072 bytes PROMS/Formats/fmtall/RNPAOPBCK2NHCall.xml | Bin 33858 -> 32286 bytes PROMS/Formats/fmtall/RNPAOPBCK2all.xml | Bin 33848 -> 32276 bytes PROMS/Formats/fmtall/RNPAOPBCKNHCall.xml | Bin 54072 -> 51762 bytes PROMS/Formats/fmtall/RNPAOPBCKall.xml | Bin 52754 -> 50444 bytes PROMS/Formats/fmtall/SETDEVall.xml | Bin 24752 -> 24026 bytes PROMS/Formats/fmtall/SHEAall.xml | Bin 78500 -> 77134 bytes PROMS/Formats/fmtall/SHEDEVall.xml | Bin 33056 -> 32230 bytes PROMS/Formats/fmtall/SHERVSUall.xml | Bin 36394 -> 35500 bytes PROMS/Formats/fmtall/SHESAMall.xml | Bin 76996 -> 75566 bytes PROMS/Formats/fmtall/SHESSD_00all.xml | Bin 18326 -> 17918 bytes PROMS/Formats/fmtall/SHESSDall.xml | Bin 52670 -> 51654 bytes PROMS/Formats/fmtall/SHEall.xml | Bin 78496 -> 77130 bytes PROMS/Formats/fmtall/SUMSAMall.xml | Bin 130618 -> 129000 bytes PROMS/Formats/fmtall/SUMall.xml | Bin 129798 -> 128180 bytes PROMS/Formats/fmtall/TPBCK2all.xml | Bin 35022 -> 33452 bytes PROMS/Formats/fmtall/TPBCK_00all.xml | Bin 22440 -> 22062 bytes PROMS/Formats/fmtall/TPBCK_01all.xml | Bin 22598 -> 22220 bytes PROMS/Formats/fmtall/TPBCKall.xml | Bin 51522 -> 49288 bytes PROMS/Formats/fmtall/TP_00all.xml | Bin 23630 -> 23252 bytes PROMS/Formats/fmtall/TPall.xml | Bin 65638 -> 64426 bytes PROMS/Formats/fmtall/TUECABNall.xml | Bin 59850 -> 57954 bytes PROMS/Formats/fmtall/TUECDEVall.xml | Bin 43388 -> 42456 bytes PROMS/Formats/fmtall/TUECSAMG1all.xml | Bin 69276 -> 67182 bytes PROMS/Formats/fmtall/TUECSAMGall.xml | Bin 64668 -> 62554 bytes PROMS/Formats/fmtall/TUECall.xml | Bin 77076 -> 75302 bytes PROMS/Formats/fmtall/TVASAMGBCKall.xml | Bin 46290 -> 44026 bytes PROMS/Formats/fmtall/TVASAMGall.xml | Bin 68326 -> 66660 bytes PROMS/Formats/fmtall/VCSDEVall.xml | Bin 26966 -> 26240 bytes PROMS/Formats/fmtall/VCSSAMGDEVall.xml | Bin 26992 -> 26266 bytes PROMS/Formats/fmtall/VEGP1all.xml | Bin 186070 -> 183638 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 230064 -> 227664 bytes PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 210584 -> 209292 bytes PROMS/Formats/fmtall/VEGPBckStpsall.xml | Bin 55278 -> 52936 bytes PROMS/Formats/fmtall/VEGPBckall.xml | Bin 96722 -> 94402 bytes PROMS/Formats/fmtall/VLNCASall.xml | Bin 15372 -> 14876 bytes PROMS/Formats/fmtall/WCN1all.xml | Bin 97912 -> 95018 bytes PROMS/Formats/fmtall/WCN2all.xml | Bin 80442 -> 79318 bytes PROMS/Formats/fmtall/WCNBCKall.xml | Bin 55312 -> 52872 bytes PROMS/Formats/fmtall/WCNCKLall.xml | Bin 56190 -> 54102 bytes PROMS/Formats/fmtall/WCNCLBall.xml | Bin 41686 -> 39886 bytes PROMS/Formats/fmtall/WCNDEVall.xml | Bin 36054 -> 35096 bytes PROMS/Formats/fmtall/WCNFSGBCKall.xml | Bin 55362 -> 52922 bytes PROMS/Formats/fmtall/WCNOFBall.xml | Bin 52434 -> 50100 bytes PROMS/Formats/fmtall/WCNSAMGBCKall.xml | Bin 55352 -> 52912 bytes PROMS/Formats/fmtall/WCNSAM_00all.xml | Bin 40856 -> 40030 bytes PROMS/Formats/fmtall/WCNSAMall.xml | Bin 90676 -> 89500 bytes PROMS/Formats/fmtall/WCNSGIall.xml | Bin 106062 -> 103168 bytes PROMS/Formats/fmtall/WCNTRNall.xml | Bin 48778 -> 46330 bytes PROMS/Formats/fmtall/WEP2all.xml | Bin 80244 -> 79150 bytes PROMS/Formats/fmtall/WEPBCKall.xml | Bin 59084 -> 56940 bytes PROMS/Formats/fmtall/WEPENB_00all.xml | Bin 23702 -> 23324 bytes PROMS/Formats/fmtall/WEPENB_01all.xml | Bin 23750 -> 23372 bytes PROMS/Formats/fmtall/WEPENBall.xml | Bin 49384 -> 47188 bytes PROMS/Formats/fmtall/WEPSAM2all.xml | Bin 77084 -> 76028 bytes PROMS/Formats/fmtall/WEPSAMGall.xml | Bin 51502 -> 50590 bytes PROMS/Formats/fmtall/WPBAall.xml | Bin 36968 -> 35522 bytes PROMS/Formats/fmtall/WPB_20all.xml | Bin 43302 -> 42474 bytes PROMS/Formats/fmtall/WPB_22all.xml | Bin 36274 -> 35446 bytes PROMS/Formats/fmtall/WPBall.xml | Bin 38530 -> 37080 bytes PROMS/Formats/fmtall/WPSARP_00all.xml | Bin 32010 -> 31150 bytes PROMS/Formats/fmtall/WPSARPall.xml | Bin 46902 -> 45404 bytes PROMS/Formats/fmtall/WPSBCK_00all.xml | Bin 33118 -> 31950 bytes PROMS/Formats/fmtall/WPSBCKall.xml | Bin 53130 -> 50978 bytes PROMS/Formats/fmtall/WPSDEVall.xml | Bin 29264 -> 28508 bytes PROMS/Formats/fmtall/WPSDOM_00all.xml | Bin 53038 -> 52516 bytes PROMS/Formats/fmtall/WPSDOM_01all.xml | Bin 21702 -> 21128 bytes PROMS/Formats/fmtall/WPSDOM_02all.xml | Bin 31562 -> 30862 bytes PROMS/Formats/fmtall/WPSDOMall.xml | Bin 43264 -> 42264 bytes PROMS/Formats/fmtall/WPSOP_00all.xml | Bin 48806 -> 47188 bytes PROMS/Formats/fmtall/WPSOP_01all.xml | Bin 48732 -> 47202 bytes PROMS/Formats/fmtall/WPSOP_02all.xml | Bin 48748 -> 47218 bytes PROMS/Formats/fmtall/WPSOP_03all.xml | Bin 51502 -> 49972 bytes PROMS/Formats/fmtall/WPSOP_04all.xml | Bin 49844 -> 48386 bytes PROMS/Formats/fmtall/WPSOP_05all.xml | Bin 54200 -> 53080 bytes PROMS/Formats/fmtall/WPSOPall.xml | Bin 74628 -> 72824 bytes PROMS/Formats/fmtall/WPSSAMGall.xml | Bin 48260 -> 46940 bytes PROMS/Formats/fmtall/WPS_00all.xml | Bin 23776 -> 23316 bytes PROMS/Formats/fmtall/WPS_01all.xml | Bin 25998 -> 25526 bytes PROMS/Formats/fmtall/WPS_02all.xml | Bin 20254 -> 19864 bytes PROMS/Formats/fmtall/WPSall.xml | Bin 59748 -> 58638 bytes PROMS/Formats/fmtall/fnpnmpall.xml | Bin 59254 -> 57032 bytes PROMS/Formats/fmtall/hlpfsgall.xml | Bin 106866 -> 105580 bytes PROMS/Formats/fmtall/vcb1all.xml | Bin 111454 -> 108526 bytes PROMS/Formats/fmtall/vcb2all.xml | Bin 83890 -> 82168 bytes PROMS/Formats/fmtall/vcbaall.xml | Bin 101550 -> 98488 bytes PROMS/Formats/fmtall/vcbalrall.xml | Bin 51106 -> 50160 bytes PROMS/Formats/fmtall/vcbbckall.xml | Bin 71004 -> 68526 bytes PROMS/Formats/fmtall/vcbeppall.xml | Bin 95240 -> 92178 bytes PROMS/Formats/fmtall/wst1all.xml | Bin 103484 -> 100728 bytes PROMS/Formats/fmtall/wst2all.xml | Bin 91694 -> 90604 bytes PROMS/Formats/fmtall/wstalrall.xml | Bin 59198 -> 58254 bytes PROMS/Formats/fmtall/wstbckall.xml | Bin 76426 -> 74220 bytes PROMS/Formats/fmtall/wstcklall.xml | Bin 41644 -> 39662 bytes PROMS/Formats/fmtall/wstdcsall.xml | Bin 114670 -> 113520 bytes PROMS/Formats/fmtall/wstdevall.xml | Bin 49340 -> 48302 bytes PROMS/Formats/fmtall/wstsamall.xml | Bin 91166 -> 90074 bytes .../frmFolderProperties.Designer.cs | 53 - .../frmFolderProperties.cs | 45 - .../frmProcedureProperties.Designer.cs | 55 - .../frmProcedureProperties.cs | 23 - .../frmVersionsProperties.Designer.cs | 53 - .../frmVersionsProperties.cs | 43 - .../Config/DocVersionConfig.cs | 38 +- .../Config/FolderConfig.cs | 37 - .../VEPROMS.CSLA.Library/Config/ProcConfig.cs | 37 - .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 15 +- .../Extension/TransitionExt.cs | 1 - .../VEPROMS.CSLA.Library/Format/DocStyles.cs | 380 +- PROMS/VEPROMS.CSLA.Library/Format/ENums.cs | 6 +- .../VEPROMS.CSLA.Library/Format/PageStyles.cs | 41 + .../Format/PlantFormat.cs | 3429 +++++++---------- PROMS/Volian.Controls.Library/EditItem.cs | 5 - PROMS/Volian.Controls.Library/StepRTB.cs | 2 +- PROMS/Volian.Print.Library/vlnParagraph.cs | 15 +- PROMS/Volian.Print.Library/vlnPrintObject.cs | 19 - 308 files changed, 1758 insertions(+), 2539 deletions(-) diff --git a/PROMS/Formats/fmtall/AEPAPPRall.xml b/PROMS/Formats/fmtall/AEPAPPRall.xml index 8f7b9f114fd79487a5d409a13a43c9450d79a4a5..281c30cb000dbc9b84f24422904f8ff33f8bcbcc 100644 GIT binary patch delta 123 zcmV->0EGYQ`vIu&0k8rBlQaU1lRjb!lMn+ov+x7*1CvYx2(u&z{sEI35FV3`3J{ah z3fhy%3nr5q3^J3B40e-74VIH04luLe4om^Fs1WEZv%WpF2$PUK8j?rmvn)v51hXDZ dI02I$O(e6BPC_TMWO^h4vk-SW1G8j$h66LYExP~! delta 1052 zcmZ`&OKTHh6umPE?Ifv$8lw;?X(A%6Rg=_OA{0$yVhS-26R8^?X)-3!yvU>KR&e1) zu=fuXSGrMQ7UIgKe?bZ&ZbXEFUF*VgXOd#I5}15*zWX@m-ZL+Dl%3dJqH~L zx) z^uqL>gaQH|QUj?;1a~Px>o|9T74ToiZ5?=v^Da-mjW-?Ti$Ek=-dpBV&?O22EumHq zQ9+VEZ5kk=Z$>x3U*7waLzIy1aoaUzY^h&u;VLZy>_VoL>J0;uKtw?TsiH_)6oCy$ zH{Oo9)$wVQONV16PdEd(Noy$3r7Yc{6jG`fLK=u@YCw_j?+m#{SkXMZnXvPg<_o9M zQihpERtr(0QR0PEe>YPIEYKpIqag2SpS&>;yGvIogN~xMAr$$8ZcUI{hK zIbt=!$&wP`ZAbKsl`Si)0I#7}2|9F&fzL>TRO$l5Ecr_(z-OH`zUiE^Md&&|alYi+ z&RN?$&Qq?0_Zsr_UB*RhvIE~VqyE5fbmngU7j<-UH0&HY3irN|cim9~tT2lUnIgpw$9<3~&@Mhtbis`cqa_^gs V7mfFwvVGsH5UyqvBe}k&{stu?%AF*%%u{S4JTFFdi z3zM3>A(U&fQP>@zq|D}ma4(k4529D_ZeEwE!2%=#7$@hXXHBliR@rMY27Sg6o=Z%CAwTNM6&O3ANz31E+K5N%6+UDGPYXJ7*u@EK z@fMpALoHzFDDd1x9j7pf^1RjA`DVra_JRydG^ZjZN{gtnp-sUd%52zX;W|sV$TrCB zk#os8!e~v)OaDVStfNH2Mh`W?n#n} gA%i3mh$1NmjfijYH(4BU$`VLng`$ckgY8G{3#{vR;{X5v diff --git a/PROMS/Formats/fmtall/AEPCHIDall.xml b/PROMS/Formats/fmtall/AEPCHIDall.xml index 7d6056265a7d244646a8b7723a25f5af86351227..f23e30bc97500424baf3e7a254e1ed0fc28b59e2 100644 GIT binary patch delta 215 zcmbQVoaMc#kON0a_?-05(*+N8M z@&RF~$!sD(GnDD@w+kw|osWgl4lG>70+M85nx4hNSTT9S*H6>y_!)mKpCrJ@3;-@oO?ChP delta 1187 zcmZuw%}*0?5S^vliXRkOXbfO%#bDAzleVBhB0~8JMraKs*2IG;P$^mqZd*hl1}`3r z@xUbZ;sN5po6)QZH~#=nBqkob_z{aY;sFzH`sTN-MBOym{&s$E-n@A;`}L{5_FR9t zs{4m&hUTb1LzKcZMFAS7ahgXoO}*5{(fUSS)gSRrxwb0{WFDwN$^e<8Szyj1Gfzpy zk-^P8-NY}27_w=S3@WnIxy4T@rj z7I4mkZ(ilfd#)Pg`@M~&FLhc=T}nx^N{{e`d(Gx!XKa6XmIk26KwrX<$61t*AR=n3 z4*bzeY4e@CzQz|&j^0sA|X rSwxgJhd8*fY~JVMBfD88X$KpSP+{CGmvw^)!m`V|#I)I@P>UG=G(j`;5onbhdd}TegkJ@Me6GCiB;^s=KxCatI89>9zt=?hiyhZX0b50rhESu| z2z?eI%Fr;YaD)%6uEA*-ts`+7)*j?UtZ3}(_{ynDwMJH&Y?SfaDn6M())o}=R4_4{ zTZ4yBb13zF1093T2NO&2QSeQ_&s~5^1)3{Rc4-aTIk-;&eG6tmLRtUL&M@Zr$hf~S?uSU6N^jB#Lcf% z&O$2FHmdMIP4MYRm`^ipI+dA!6f!j4%RcMz6AJVR$#pEbQWdlEr{_C;%l7e3w)497 z@7as72Mx^)Mqyp1)mtSkpf&O?s%XC3-m8B)<3SYRVlE}vquLvD5^Ph*`YKn5M++E3 z#f&u%(0>3!`rlfg(o4(xp^m%aHU^#XIpNhw#m8<;*H*r&#NFf}lJ$ayn<;+-_b_dG LNonDNIbi(<)BmNH diff --git a/PROMS/Formats/fmtall/AEPSAMGFPall.xml b/PROMS/Formats/fmtall/AEPSAMGFPall.xml index 08fed244acee6a1ad5988710b71d8886b17df67a..170b6e4c995b9ff5b0cb5af1be99346c27721d0a 100644 GIT binary patch delta 286 zcmX?el;zznmJLUkCVyl4FnI#YqRnlrT&$A?M0h6mIdDwg!zDGDi~GZ5F`jjs*?1=~ zZMG4ZVK!MVNMLe9zT9RD_eVmLZ`JZmij&z~5w(CFsGnz&tJY+#7@y4tlCrobPs@{< z?2yMbSuCev@`W3GlLPYoCU0cWM%a7{8XO^h)vG;u+UOIO6WVnKjJ#f1ra-b|4|$4oN0bMLw5o_F4zwb#a_55~p! zc~w0WqDe}VhXQy9$U!}Hj;4_f^NBMyzHKPrk9n&{9n?)%QIF9Cg~<=>EJYFZ0-Hq7 z4a7;B<-kuXudeND@FJf^E=41VBuakA{$)F;7TEweQb5&`gYW#PDh#OXDXt!?=68n2 zb~ox#^vqyln1WzX^|HI)x~nE9#dm7T1*19N=1@n+X;>wY16|b0LmoTdx0E+IXaM6= zpd5e!F%U?h@?ZfRB&|l0RQ5IFsi#_gVET@+A({fGmwd2f8uBEfo)^q^erSHiFU_UZ zesEj^qZ|BvV4r|>gDP*BV!W^dTh~jJ_Tss`Te<#gq<#npLP!`-3`BCMI!Jnzt!?Ku zF(W|Ugzz1d#x%T(Nvqb;acYDebu3ycIBqIY-dLVC7dxm+9T}hqmyKH4;VI(7V-CLD zS;U{(4k>e$P zNyCYh&2%3AgfK46iL+MabLvaV<^v$4uAmnKW>j^qSAT?4C`&7M3v}xZYMr+>>y+mk z?fDgY9F6jxHJ+`_xIvevQL8`toy@P&<7lA<`~a;$`HV;O08Ie6=p?mZn1ngSlU1|$ zsx1GCip<+0VHP!dZBknsHKDCpZOWj@t1q!$16aMUCMv DRT?Ci diff --git a/PROMS/Formats/fmtall/AEPSAMG_01all.xml b/PROMS/Formats/fmtall/AEPSAMG_01all.xml index eed16e4245184cd2f98313d305aad906862de058..40cb55c8a634f47e000350345e960728c14b0904 100644 GIT binary patch delta 79 zcmcbymvO~T#tl47lkJ!UChubA+1$ev!#FvFMQE}f%aqM5tW(q{7ieirey8IEqBpnc jHi%3va*~=XS{oOFwNXN`Mf3-93fcvurnE2>6I~C^RFX|HYSFH~KoIW(w5?Ua ztXlL5LTFjEX;rlABXsUq5v^jFH+O!V`_6smUEXSsciK%vPZnUKjXu_4akY>_0h>4= zb+CrCvh{FTLUK^x4WK}Yc%tc?FH)86gIqqjdXS35a zLK_3L`2DucVmq+%)O9GSKIY@}%{ld8#wWh0dN<$l5}3?8>X%xyEgbV4E~^xBtXkOnqiFK1azPU5Fxw7s0E>~; ixq&qPj!@Vj5Uvz2qEi)Kg&ibbCOiuK41d^o4u1kT7ji@Z diff --git a/PROMS/Formats/fmtall/AEPSAMG_02all.xml b/PROMS/Formats/fmtall/AEPSAMG_02all.xml index 1b647254457e0d8d4bb0a16f3eba5e3ccb2e5710..e5932e82d8349865cadd90b48544bab324ba784f 100644 GIT binary patch delta 71 zcmaEHlyS#F#tm#tlP#D8CUfcVY;I$UVVo?+lC${;OOWQ|Dszp=IeJbYdNYf@l=$Q{ aHz#3(O)c2)5Fkb!E>9OGY;0pd)W;g~ z>fI<Ur&K;pLm3TJH)Js`G2EFu;nR#)8_HQvi6LXY21 z*$VcxRHUWaY#gbIRaRc9`X7FBUz(fE)aaqF-sN=1BRU!UPk;uKfQ>Zx8_ z{C4sOR~hz8O(GRXlc`e6gdWc6G-PF>%BqK>UyKgZkn5AspY33ZYq<ip1zX?!85IAC6C>Q%m+ntbm;&9 diff --git a/PROMS/Formats/fmtall/AEPSAMGall.xml b/PROMS/Formats/fmtall/AEPSAMGall.xml index deb0b289bef371f427b3bcbbae3d239d52ff478c..2003588cf1b10f69ae10521707fff5f905531606 100644 GIT binary patch delta 257 zcmex#kY&ntmJQz+Cu=Z$n0$zN5o5%3M@B}`&F5IYuuRqy=9#?CnqzVRKiA|RoC1?= zxb93g;a;~{g=YfO<|zIdW|M6K1txE>m)jiX_DE>*0uPPNQz93!Pv$TenEb#-ZSsc@ zpUw9Yv$!X3$(5QMm&-NTB)eg9LSD>dGjpZQD*2~aHnWsiFivJEQQ2HpTEMtjt$arD zW|p5SjGOh7xf`u*pE?A34Tvi~tcAW2FE9 delta 1279 zcmaJ=T}YE*7=7Mt{%mSE*BB1KR92vwUB3(+A{5IRA~(n0o$V(x&yakGx2wo~>n7%5v$$<`NgRsd5n-nyLWUKfGcX{xB!GwN;W@vPPamk`Yl9|! z)z_gc55-FgR975`SMAaKb!{$I3Q5V8%qODd+8B4&45*U~Qrrg1C*vzYZB1jFuOe4g zGDNY&a;0mrO>L;6H1-c-0KD?=fsIp|#=e`Z9VoR&+YD22CR@eUHanAU<|J3&lOhc z9relw#JFE@_k8@;f~cFfiBRrCfjB0(JiGJ8#(P~#ukv=|PGOZEWeYW6)BUQa=T}9Y zu|^No2$YYSs09Z6xhF<3YjW!0q{02v2wby7nGHFQMI;QmraY=m|}x5zD2igob|{tqS? diff --git a/PROMS/Formats/fmtall/AEP_00all.xml b/PROMS/Formats/fmtall/AEP_00all.xml index 340d6811f2da13b1ed17dbfbd96b44b05bad209a..3dbb09c35f9ebfc325fc87d926da7a9d04858a23 100644 GIT binary patch delta 96 zcmZ4Yi1FNA#toMkC$lgKOztw`+Z@8w#5I|V_t|D6J|?ZnRaSbFCs-VV(rue9tTd!2 xp9z(k{4VqvP(o(%1rN2&G2tpKo0mm@;@!M2Q;lWvzRak}3-b6j7v$|@0sumsCyD?7 delta 616 zcmb7Bze_?<7(Fk9AWDL^EV5sNMWAVAL!`Zo1XHsY(o%@e?8i&xsYQcB(Av^nT>A$i zcyrNT(9qt}5-n|Q4V`<-kZ6g=yL|WD^L^)@b040x>u2reQ5%ZE#6D_RMviL^Uc|75 zGSLDSFe26u`T}X#MDlH%B=$(!^|HC2?hWob8?upU;a7 z0TXrJweTYu#jcXEm5jlrx>%eKiu?G0Xoe4jI~@6cr_&5ydUTy`EZ+2(ayCDCUlkkt zbmYa~=dH-4Yrhybd}6}r@BBuEZoKF+Q0eWfU)GYF$0l1omc{a{)C~e!=Fbog)RO{KkpWbf$dC(E=?FB-11Opf6bk^Gk;;%a+1_7ta-28Y zW**)?b=e@GvJ{3=hGZZOv(%9x4Qx@-IY1Yc z0SzqzLXf+_LBn7Gbh!cpc6nEzs!X88Am15GUhb(md5xzOJ5+S?QP1bjpg=4Fngr1g zVuREsGgJcomIpT33CK!j$VO8U4)j0BWKb}#^vYyWb_Oad00wRmSR-< diff --git a/PROMS/Formats/fmtall/AEP_02all.xml b/PROMS/Formats/fmtall/AEP_02all.xml index 00f0238670fcd74fcf52c86d15fb243cba2fc8a6..cd20bc8224f84c0617099ad6ada39c6606c3d831 100644 GIT binary patch delta 75 zcmex%pYhmj#tkA&liipECLiGD+B}I#himdDo}A4Kc!M-2Kd{o6>|yQ%qBlPy{`w*;iIY<37eCbC%}>l!Nna(*4@ delta 511 zcmb7B!Ab&A6g^57gquW>Y$Li57g5t z1VMd)M9UWKTSn(TE23Qt^WJ@jbKbf4y!&bF{UvstjxX2Xp^q_k;Ba-2M-3K+@YIEo zRjGK&$iwD&3?C!3S?%(dbMS+1p+MBZfD9jns2JZ|H0lIKq}6$SKv<+LZ4q*n%EvK8 zYQn$<3aXPFt~P1bK!+NSj2?Loj>xR=u05h%V*A8GVu8BsWzfD zzfCJR&_ YmRb+#OoI>N>D+CCXWGw*-n!GoC#?Z*!ToZNpx%OUazVYy=0^<$jGHGlElS^f z>7xqc=AzebY(Q2QhzMYup1{dCVY1yDx6KQF88AUq@ck=d1+%svVPRBbhA>Sy8N(pV m=|JX#=?bij4%_R58JQTTKVW0j*e)Z$$ifIw8Yje2sAKIGfbk5JrXvnV z=6HYC&fNuBKG=lbYS_${VE{=L7G9M+SX+)1y_Of%#4yT$YLcOZ66l$Pm_D>XYOVM#YnQwD> zkYWmE9tnPd)p;a14TUg@G+P8FF zGwugDi;#aPElO{S)|9lbHFS>ZaQPZubQg0^he>HE+HABssZF)?(*%F;ms%v8ewRXE zr<5$;mpsc~5U&n2D+R-wnT0ZzoQ|8u5JPT+8&A>8KWEBThhoa5V9;t-Bk_xP>1i#T zFSR>S%tfx<(MPW3jd(Rbik z++KJ#?(hK^RrkgVgBdklLn0?jR15AZv?=S!StAeq@F?HDMh&{OOQV&Q8SH-XzTN)ztE-%LT@_Ho3tcbdQz#~rt-+Qz0 znb!}0WgkYD>By}rQAd3a!j09s%B_m$z%rDN_Zs{Nue+P)5iMe?cuj2KZ%DL@D$ymj z<8$9U+2o@v1RFOZnb2^4opts~Q7cvmf9gLVUgeTbQ6pB1I?*hGVkgernvHK8{W(s~ z*(`Rk1cgg@Ij;>)W51u%>akr&{b39U{O8b}*uLZqO+vd|qzV%+@yH z6iZp=GEQ^o4$hg&_G*p=#a^8GG$*r`>$`Dy*^Iojmmzdr7SH_9m%iTjmo6w>F@2TREJ;5=7%!7z(;z z?^pz9X9)RSJy^9eUj^Q{Mi|&@Lu06(*Ythv)V~(F|J6J;LEt@O^n7uZJo!UDuXEq+})ezjpV|O{8gL|J9$?71n~7N5g}_NS z)1)D}&5qlnj+jrABL~TXku&wE`p9MWUns-%)Q;m9t!6I_otUYPs8=*uIGvhQ-T47R z`yWlJ??Nk~{^uqY8SbX1V0d-PhQyZ(@o1zBj?u-biP4aTQ=?-zl+dU0o$(2@@@003 z6wi{e7T`!?8XhHPF(7o0T}Z#+_C;;VvwHu}zNk2N7Rj|1<-bxjiJ@smc{asJ>DP1% zzcEFnWGWrd>ohfbbJ3*SUK1goqU&J^uAXzskr|Y&j(%6e%l~gLsgy#J$CpqM!aruk zu2iX^dlhy#A9kz3@t=s5R>XhPRn0%ANq(`3bi|VZ)$>Fr`0g~J=SiWlm}r)n*lpOS z&{aanUrO0 zwNo+4;T)=yr*g?E`*P_6xjv7|%u6^1*Nawpyqs(Z-ZU?v+W0e{ZrGl_(P1}~qv^3`D! zo&MoCv{jDyPzb0)nGP^5@MJecksYqSP!Nb_la?G9~`woV(=f_NU$ zLim-hHREYWyH^{=?>q4{qOI24+7|p8z^_5AP1~UjQ<~RGHBTiQXDb?K71d#amknxl z_}+>?C)D4AML{eJ%55B!P}x-C)B+gc%?6>ApLmM^q=)1d%^2<1{ItBvO0LT1Ggv-= zxoyzA1ttYB_qx{#JzjkL&>h6=2uxxdy!ge(nIcP1cgE*Lceq-@ev==12e3ATquvb* z2H6H^s>4`2W0;GibMKE}gxjk#==ia<;%|6|d+~ zr8D({Vv#|+PA5~=sy{z4b*nAvL}B&j#taIFG(J|E4>AHHrjue=Fq{;Sd{exr*0Ihz z;ky?$C(-1phl=_&HQs<#977p(NGRy7fi}2@oE|G3sGds?Ro7F#GoB7sr{n~+ChSv> z`9ZkY56L!sZ-=z|@j`m1db=%(8PjD_AH91l$EvWzr|<(!k$oyN^i^(=s4sAf)H#eG z=>vN3F00X3(Z@5{OgeXFZ2lIYBe!G!h2XvD zNf8P9XJS#y1?gn3m5M2g9@$uLYn0<*uVA%D0W9JyV~>}tO@31SATsS#13d0rcJx2Mqi8{ec)JQkXC`Sx@q)6w>NeSMoa zLgSl8%!d@J=t`#Xj+?D**m_vofbVV6r)Am-Z4v#wqfk$DiR8Q{txsEv-TIL@_1KS- zA|TPoaSZDJ*(hvw7HUN#Jdp|W&_Rmp9Ho0Yvu`l-u^$fb(Sx1eWfK$R?)10LJRC8k zt%3y)V%&>A>G(@PG8tAEcD4}N)l65I3VhNOEqn?n&tMRQ(dmLJ^5 zC*KC8%!WaJFZ;YM8fkxPb*@; zbt)P)&Sh11qhsu?SX<0^a*T##-fWaUA4JPwtqwdOVv9jW4RT*^rVf>ddeWl4w`G{j51S~$v&jciS>h2FqsS7SLn|ci*)k% z(i4=5G_P~1xg?tH3KO-ks}B~9;J*{OxPc0*md-O7J)H2AcP5Xry(v(hc!Q$h=!`wh zWH|O6BLI~K<@ChM@#OLj7d3@TF3)jQW6Y_pfPKRC2H52;032%~Jl5mUjAz~bT7c}; z1$5qfKjm*qqzPYqnhSc&?32ZwPCoua>iwv7M?z z|8%jiC2?ij3eTf^k#XZ1Q`=WcyL(e?%y!HWK`dw9_A3QwS2O6+-t+>cZU6`xz+9wv zkVdLVEZ@{a&4;q}=G#Oj)!ZGQS2gW9_*Bu*A*fW}pJh1u=g*$QO#rvcLo{^OnlUBE z6bq3!476Rg7`=n_akOA4k*e;?r{nisi9GKfi9QE{(dYV5^tp6P^f`HJ^!ekM=L_4S zz7%x&63%&?-t5G zGe7eCvC*PAwLrvn4h9F)ET${z^1fAc3XCXbo@cpb)r$jh(u-Ph;{ienjL zN_#-g^CjeXGAnob(|QqLpvidQ&^kd?&s@+O?IMd(Kg&0E@BdiLbS~P^n{HRsBcU2; zZkcod;4pL(>D=gzQ+<%LDRS7L))UDeFfLzxxKGI8MvQewuTkMFqgTB-rVlTmON%vN z9Z+v_QxjFYtn~ar2PIFY=vn0=g__T&>X#bCLmdC5(|aU`EJFKZEZq9N{`^y)ZtJY{cnQS;$U!*ir>28ks<9sb`P z{ob)WsykUqDMu@Em^*yPPG)iwQBL?JMAcn38a`Q;z!DyM&1;ixH10o|C}#5*x<5Uw zNZ9GbsZ_dfY)M0{jH4TM?`jBggn4FarxpZhsa{Q8ViXvIaLq71GifbiZdOrk!+Kn4 zB9~7tBr*M+l@=Q33Z{>d2WD{-J&4%+{P)Uutg94#!j{8iuFJ5cf+qg3f~k)#eKnVEd$DTIeepE0 ze^~FGFI@D_fePcwuQM$(xas=$TPF0kbHx%GpIAxbr!$R}7pv0Q1NP}XAc>knP&n!6pd9mU6xNoLF7aCn>_6R*I zTXY%Y6VJuXWPmaLxo76h;U9YZADPAzUn~-{!}nuu=;gJS#=mT&i`ABSl3e8(RkMy7 zpBF**Rm|B4$!+x6Xa<+0RC;tWndVPEl{2-Dd89fC1$yyI8$GdZ0sU%n2~D^XwY_fHPDGI`g)43i{v?rkwF|9UfJ2J{w<&7UJ?ebY<7aIYX+TJsfyYHH2bf{|B# za?7HzRddCu_~~&q2H0g^1Ck5JK1daf=}Bwhh;TvHmllcw+yl61sFx_R$semO6m9|k zaVPABu-W&9OAl2#3-$ZUg+)KISS(56ay2X~wwo#s=IR$0i$@ArbQmAzM!s}A;WeLp zjl`E8G)VlKPTy57;>Ws+M4dp$`E3BV`P>Ej^-pp0O<*SU(QBhQ`sa&9I=W)jnIK+j zKUPzjF@}p^ro-BVwcMKzp=a!1Ghr7l5v+%Cy>eaX6dUC5) rj;o9#Ec>WOyfF)JXRelo3|>A}m^%B!N3*8gbwyOub3$Jq5KsRXzC8C{ diff --git a/PROMS/Formats/fmtall/BGEALNall.xml b/PROMS/Formats/fmtall/BGEALNall.xml index bd58d61a212490a8415cac2065e3cbbe57993960..7a3136f97ae46198bb7f1d614e4f42f3110cde84 100644 GIT binary patch delta 259 zcmZpA!}jAo+XgPS%{FXejFVf~yC&OkxNY9U!NR!t1E(6(W<8!8%#)P_R3LkO^UP%|g0c54Vtl~_ b6@Rge@fVo=j~T3UJ5Z+xOyRuEj44b25g=J; delta 1311 zcmb7DO;1x%5S^)|4HCctl@wE3FoqCRTBIrqV*nvF@>N>IpbJae6tom51!Uvr53uAJ zZ(=aPg^`Vkv5U9W1ui5;V_dlbw`z>;jENuT-q#XC9t+dFm)n_h&YYP$@5hGi))(8; z-8QZ2S5;{@_0bf?DIw}z?9`syZ21aX71w*IAMq?DXqF;4_27~J)5WMZQ|8tV*{`{} zXq=*mCxH#q98KaEr3@{KCBfC&sy%oxNu4Uxr{rdFmf#+MrU33n`3cI3n?A12f3@4# zV-!ypGr*5gO36z@(<16&_p{PEONn$gEqI!1^ZU!*?{aoP>M{+%`v7$zm!gx@pna}r z_D4Xx3jYyVN{JcRIrNu>i3B>xN;LVYl}?afb5yn;Hk3xdi6c9X{-O%o0ag&vBw~ZA zHSop996LoW$5ySs@~!ZC*m^ys%7sCOZ#sh_gXmh8D#m2V9!R7hnZVggz2KyA?m*X5 zG>_9T{^N?k4C5UGdjgrXvKv8k4pGS*KrBUzKuLuprL@;}PjfG@3yLk3C-G$IG~V-g zW|7M%omM(RfxK%^3yXIyu5rbb&wmG67@_#1v0M9AUU56<(1Q-Xzt=67BZCUY$cu_H z5~l`zqmd`Q+UD<_a4|T>0*UV)4(m69yke2yMsra)P&xH1-Wkvqbw0~?{*N)!$HUeV zWmdci@xB9w?*TRI3}oeXC$_dv-jGkc2yv5m8R9y7abGt=yxwK*ve1&c6uJ5_y0UFJ zBj`b11TId0Jj82OM-b;?Z$`VWc-rQ&UiFb0EsmA6T&TX8Nm-(tp z{^lz&nI$o5@&RU@$p-u^lM7f_CMN{2OupnNwpq{ro&08}d?A*}PWeik-<2~lZk|&j KzzpRTFarQyUn)@m delta 544 zcmaKpOG`pQ9L3K~B3eXktk8v~i;{?LKFEj`T{T+dgI)#^C3?w7$I>j?wP@>V7A-^Y z0|@hNB80v{xp3VXD~PznFvFiSzd8TMboxebV03$iH-!=|aDyZYJPYt6g*0kZZP{LT zt5@UDwX};2vd9xG5h`PkU==nt(ZDvp(5J$Ox0LH#`nfIN zvR;{s&&sQ)^*^CrqWuZku{@JMMQ$K~C?c|bG$S999yPEY#}kfOpiz_C59j;emZp5R zf`&eQW8b=zJHcf?4j^>Rti8hO1*3hoYO`&dzU5)dI@1C|Sd=TLCvqyCNo=uiJ&Lc) zI@U}P_vFQ}CW}!Kmw$*n9ra(>2&m)qhi@*+v?ZpjasD>$hBm8+a0Vt<1Z%R@oL8dy j?(#XIF+wq7VVJ7b3>i|0t_nBKM!ZfmDH_K~KDj;tY=C>R diff --git a/PROMS/Formats/fmtall/BGEEOPall.xml b/PROMS/Formats/fmtall/BGEEOPall.xml index 509dc770c37b9c7b0b39f83ff0814856c292a85e..e5e1c8c9e00c6dc62ccac2abc153bd5737c7cd9f 100644 GIT binary patch delta 465 zcmXv{T_{5V811`1v+g#{@^q8dT9UGsZY)V$+_a>nnf!z#)*?U6NPZ$MJaFwRmLy4v zB<(A=JjufzY&D8A&<$&nN1NXm64MvJV9Tzrzx}3~#fz()tIB(4d7mFw>~pq^52!@Z}a+rbUm zRT*4!+F=FU^1tW;EmaMEUU!uSI5+hACiviVJ=OxRjLr{2@cqX=75gB?TJ i4C|Tf;@uE@8Nc>1kXgMaIRV`UubzgCk%`Vhg!uv06|yn_ delta 2403 zcmbVNOH5o<82-pyw_t)Pn53XA`>lGdk72CQgNJ|u^2py**nnP(YJ3DEPLbOP;7#yQZbP>N0#c37) zlDJ28F!_1E^Um1?Yu4XO1tN+0F+6AR){Por^EA zTBHcyvX$q84UHrGlJ;I+kd?Kgj|((PLo`gCs1X%($-{rice(|~X*wl47YRZ#*%IC+ z!DSBr1h$R>$TQ*|#@?nxj;#JXd>=WtKp(zmeA=0$RnOBU<^!xik0qPD}@o2_SA-6IwM zPYUg)<0toJ8RF`B+ni;{7Xzx}*yQ~jKD2P4 zyhrXDp}06ynH_{}&xd=xJl0jk>*qb%%DE3LJa+YY$G^hi1Up@Q5c@El6g9hD+0c{^$MR7_LqP;FJc$1N)4oYV;|M5Yqn|WPEi;& zkbHT)G=Bp4u(aw3|Ffq=yT4xb{^4N+hhYOt@c9UgPPmB=9@0Wh@RLUJrQUj#IT;Vz z3)Qs|wvpPdWzU&Q4Z~DGYf^SMyKON9_;tVoKO3+b7WSiL3qBYP;xXIfmr`z2 zPJAhvQ}-fl!ED$LWDuh2b(}0UwZL988H(XW(_$f-GQz3f6|ra3sUZ7A{XEIKQa{Jo QLuR-gJZV*S6YPTWH(!qrTmS$7 diff --git a/PROMS/Formats/fmtall/BGEOI_00all.xml b/PROMS/Formats/fmtall/BGEOI_00all.xml index 3964d454b964d467b485b2761472695f5ccbad62..423c88d2402510a0522157164529d6e9e2fd4f9e 100644 GIT binary patch delta 191 zcmezKm+ixMwhi|fCkrqwoBWH1XY&`PH0I_xY}@CsF@6)B{!fNcYPy0fqtf&eS;iIH zljIox#BEn=VN_wNh%&6^mrZ8S%f$DiT zi!ltUdb*f7qtLY3j8fY-EM$DdynWkJMg^Eb5^ES=FhjMtY-IF-X}_|K@eWMSLm>bF delta 879 zcmZvY&r4KM6vw~EH&2DaO^u>6(PTjmCHQ8>(Scg%q_`-xl!TyUaE2xvr_jMDTqP7O zgk-?$A_y0Px(LC=i*{{;z&}7*Nw#QVn{hM!_}({9iMTx8@EBP&8IYFpo@_V~3{xl}hdGS%G{{%~7f;mdXs4P%fkY1N zJBxL5R_7g-jbMV^vxM^)BQV43K0-rOA5t5oHcPFje!h_4V#RhVwp4=YG+P%~JoYQrn9DC(G7rLqgQCv}d z*W|u>6PK&y-BSVe`)_gLZMr_|nkhVEebMvP&(jp9|05N&_R}vNXa6z8fMj}=tRG}=}?(^3&U#GTSO7()NTa24Zp$87S z;nm%?jhsU+fnHKQNGdwG?4Dhcq!~`IU5a>I7ioA>eOs0$_ui6xw$#FkRE@q9ezLc# za@TG#xsBI6GJW$qX$qV-G2I-h-SYWo4~l!Znl}3h6-n;be0Zd9Rz@lOwqLj=b&QEOQ z!d&abl??S3|r!h@4yZ za>oN{7!lg)LJPmn!O?sq7Z^%Y@DJO zbbNyE-X*D$J8hnA!1Qr~Bj>0pf#L5zlvVzsia)`os*8le`72@|5cB72B7YelZ5Dfi V@0+5_cOCF}n@DJZYpY#2;y>x%wT%D( delta 2169 zcmb7FOKcle6uo!+jcM~COp6=)GuLVV7faiJ+As5P3=^S$TZ zd+vGfU0;09d*Pb*oh=R#o#BU@CMiqHR3u$|c9c6de2&MtJ3=|wYNXQ&&0{r%SN$&E zwHg`co4Y1xiSn>50(X#B=@~qEs?sU^s^MFLJws9Bx-;9eNaLn2Yvx?RT18C(y^N?y z)IUKrqsjHc>=@!ou&yDCP6cGDdsQy5siKmORfO(EDy|hfcQ7_^yh4hC{|oN9)GIHlOBFEmy?)1#UM=oj;22gPON3i?SsXKV!z|BJ>*vL@~or zqvF5gA43aI(E$iIODcECq#HL1+r@xoJ%YF*GAw~h9!=|LV1=e(U4(7Ult-ts=>CE` zMCCR&8{WV#Ml#UvNYPP|-_7m8dT9hMpu}@XaR~IWcT^RLuep8WR^U}O%Kk0p*1l-* zIEZ=$$fn~dBUJHJQV!4%#Z4hC|6QNOb{^=HV5^W8%F1?NQ#Q-nk6cMgQ-2*fNRQH1 z@`;wi>=EzxviqeoL3t*~U7U&h!x$1N@pbI!622>VtrJx>i}q2B9x>^Sqt}!07LEPx zu$Y_V?c$XbN90#KILZTmEASxsB=6*3Jq^ap?q&}gdpzz-yLjHwc<{^4!3Nuw*Y|Lb zyTM97rTLWBSd2i-pnQFpo4p}*$JHURwpp#!<|<2(qVn7*pLYE>MgVh8+{|#R{BV+Y zxWo1t3z!UQYDC3oibL{jj(b`5WqF(*JiybapaOy}i)-DSl+%a#HJ?!lI7dsks_G6^ z@u;h5POD9a{eJ(wlPE4eKE^Te$uaKQy4fDiaj0Q}ZO`))qLSy_#Q(^K!KX%Pfu6o^ ztB&9rsp*E{DAsp!kNiB(Gmf@t7_1Rfzsw?koMUoM=T82&Q^GlFW4D4XFLIn8TEJaZ z18x-)`&rH3bO@8T2ud|$y|Z23TH+gP9kcKk&Hs)Z>aUq+DIq`lj$>?m(A6q#e8X?a z^Ix*pX$wut7S?`edH!2YYu$FqlGvzyG)xKFOG%Y@uhSNn04_}H7{PQM{+2hj4 zv=7LX!VBbkQoeDUFF9=KrL9h6?GC@~^xM%(S)^htr~crpTG$Sg#sD6{;8a+&yWbhG zLnVM1sn+KlWJjwJb)wgFMC#GAbS+f-uHVTD0mF!zAf7o`xPCGOf%YL<>q{ z#9I3X1L^RHpf1Va2R#Uh@Zc##cJMGd3=ye|Sac8%;v9R{?ZfZ${e6GG_2+GGe#;eC z14PX1>P=n7M=QqZ+i9T*J9lcwU|$Tu9ad4vgxMUc$~-wfBVci) zo2MogM6B6q7#W=x9-KK;UBt1+14pIE*-1=ZzQ9-K6oIFo))Xw|HPo+2*vNOH@Gu7Z zljZ-5T7Lx5A&sq95psxdGZ1TKx7F?fbl8Q9x|XjbXCHa^uXp_iU6_{Bgng7yq84 Yz2@qeUtD}dSwGn`L%V+Q_!Dx31Fsv%!2kdN delta 2367 zcmbVNUrbwN6hB{YJJ|RiQn7Z7!ooIWNGV+rGmrvh%+c|$0}_n$LOa?CEo;kQON4 z^E#L_SZ25IV$q>S+Vih z@F>11yvE5iia0?0UcT_Y zi(N;H`HRUX_`*t^cJKM$3$_W?6a7xUv-UxWT$3kkL8jy1*6ce^ zz#hi-rupPayY}v-!`EvE0SIGIBybf(Faf1H9t@y%YQu;*M4s&ManT^Mn~mZ-tKAfx zU3ZJSHdC8d+V+d=oi=gWW}3^3EbX{fTIJ=Ey)h;lMfQBB_{1FDVq8Js)keNt?4f}8 z!<<=5j(hZ&_|;Nn#=X_3Z@;z1%<9oK@Ieo6F4C1zu}g89VZFL$K3Ty7-nL_|svk%T znD>5TfOaJOg7V52lwQ#_`5a16=|6W4(0zGbugnk9mEW_zKVdzPlCQ(GsC>`+3{BA^ D`BI*C delta 2308 zcma)7OKe+36rDSMF-fF4O;YDm$FbvxCRP%#onHg3lE!XGOB3f;RZuGG#BP4Z4Ngi6 zLM0Z6O;{8j(sa|RAk^-nA|nO~HbB)Csz53%s004ZwREs6r~{cU6_rpzyEYfB!amG7+{rRoC^aSkNIEUp(ytGZdpT&X$HW?7FRI0>2=B$j{z zDO9q^24S6sZA9yqVi}PzxLbr8xGVohjh`MLM{a3=mb9d*+(XEJ1cInql+3V+(c@I< zDWnJ9Nfh%697h2{b6Hm8>Ud?5mN8$p`)hh*2}F-7{cu|-snYO|qZ3)gBQLP33RP8Y ztc!(oFD(DM&#H3*=yOO**RN3)+t^07odtI*$Rbd@Rg@F=zIodtZ+mEvlV6PHs4_SK zWz;rQ%~LxqtHYXEkhN&$e&l%$-lWLIs9S_O5qLgMm&Hfz)Gsa+bEi1$qkUp5M-`q; z$Yjn(e?GP)Ox$Uq6>%X(JI#~sQgLgDTE&$l1;n?lw9EXh&MB9h>7-*z9tj@PC=|I_ zUV`4Iwrdwdz_%A*u9iFHz8?Ci*sG4Y>b2D^^{qOnEJ+p+ zFE*1$Tz`h%lArcdthm7*J+1L-w^$Lf;#uN`&mKI50ilLRK$gepC>Qm9s`6|C6}djD z6<1fDgliT|@ zj;E0Leu{$P$0^#qJX$XRnQ22ZCB*(p3~bEv^T zi9>1)<3;gt6Sm5Yc?y|V4Hu4ZR(E+(XE%#YmcdwBK%BaRES>dSlK1B6<#*k244$OE zcZT6Tt2bd-`l@-5eyRCRFrc4`1W9xphIqPAH)3fljOY R`D^wK52>ucH5}!q_`f*O;wS(B diff --git a/PROMS/Formats/fmtall/BGEVLall.xml b/PROMS/Formats/fmtall/BGEVLall.xml index d7758ad0c0b8ff6b987d5ca761315293dd10a7f6..b616c0b91e74a36003b59d60742f3822cfccb76d 100644 GIT binary patch delta 190 zcmey-!Mxxv(}p=*o6m6-Fiy_lahv>xXW8UBeXhx8cvU8I@R>|b@DteF!zgr>)Uq2D3J8e8B`{ We1h;cJM3hFvKsb=Kv_bE(wG2Pz(*DU delta 1206 zcmbVLO-vJE5S_L}5f*IG3W$aZL9L2xp$ck13ZcR9Q=&DPXd+8@DPV1(v?>=9Zr(JG zC({@&#DfV@zC?|9Q4X)!Gkg1o^XnDY zy<7>uJzTM&hXyD`CRu#6%PVe{q#gcl8YhF26eo*LP?pZ)GAK>6c+23PK)jvmD9G!z zzJ@q;sq6rvGq?;@7Y06sx*kwZP=?#JrCJ{iB9>f<0XeF;B&$VJoGPv5H;u(yURLFe z0y#y;aldHyqBg4I`m$F3K40t~fT{$lCa533q|#|oOhsgesO%}ZdAhWQKQ$ML$+8ib zHv}=0ARVL#b%Qz~srk8kZy*YaODI__BpaK>figIT1=5TX5};;C3GjROp+=i&7|l#% z$6=45upw0SA{s|*NST9ro)$H{+jE1<$JXJw^GFMwQjB3B5~#3XsSg}ec$4z;w$L&3 z9)g`x!HQMitcFMgkuZ>HrLhZDa%ksPEs-ONBAd-K+iGQWZAZzIpjrOtuI3KSEuMI` zI{4*AjjxYwu8yh3e;Sv!itlTc?9+?Ia>e6qo|wNUUKgIFtFB+u+Zd|= diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml index 03598b46435e664e0579ce18cd27051aff42e7d2..d13df054f45c6d94605abfce250f5adbbc3c6db5 100644 GIT binary patch delta 506 zcmZ9GKWGzi6vw&myMz$y86jklC`Tzl97+eNK?o>FL|R(08bT;iL~6yV1ziM{s7KVM z#L%DSbqFfb1`JZJTu}LeKDi zl~xV4RsP`R7WWKQT8gW3()7mO>{{ybimm3C-|F1eahkW!!hF`ONwa2T-?8%>adt1D zkMk*<;ra-ok~j~C{+o!N1kLq}m;;YJM}*sH9OK-3jEX&h4EgqmxEYv-`DY3iN5*v> znn4HuYE_yDN$wURrc~~t8uryS#CnKwfFEDgRC^BhD=Ye3e|b{!PjTk}mv3Nz3nkRJ zl|nyPGO(rb3SEQSDIDkgJo@CsBDzPpu!aGdbP+W~+oa()zVqrA1i9|vIwxICs;}Xb zvN*)O2B!Rtn7sIm&TARIM{z?MBLq`^+@>L{U!o96;tDw=8(C_QR3>SYq%cJ>(^ng^ rJxy^)>?YOz9;E|5W-!2d^P6NI&@8bAw50lovc!MJ>8or$p(gDE!|TKT delta 2201 zcmcgtZA@EL7(RUuFm!yac#B=FD<#V$GAyiR%^b6(VVOyxb7i8#D2$fz(Uk@Y=uG?o z1_3t&4&fLx*ELa>b<<$(kL%2`M6(}?Mp-oa#~+gTN3-}9L(F2-_uShe;GOQ5KW^{6 z=Y8+f9$1#h2JS3J_E)(>PZ9XB_R^#$rB*SH|dqaT|UxD+DMcfBViIG zaqm&7K5TE;SEr|DajCSFAlm(1ZaU56rNfW+{++K`D`D@K!HrQmj*lcIR zE+elVqDHpp`rhnC&%Nd&g5MU#q#|ml|+6jwCZA z>XB}UCp%~{TRfe|9=&9e=SNIAk{}Z!htxW?#7>;VP3-K#M9|WVBHAz(#NXqH=0)n6 zGFwKa*~upMf!mm`(M*?PmMJTrehYG~0jw9G~<_=(sCWPo`;iq|%a%vXg`&yA<|b4W!%=vA z47Txi`yfx!ROrMlTheBcg9t68#pREt{xqml^}MDfh^5-q!eNYST7^Craga)Eg`L>a z8JVc&L=%#E8Y!t>s974Gp#C?W7Of!F*wRY8DiBp5K0x+y%L`D*Lli(o_*obB zIfCwp!49GNcD4JWLpc6CnSe6(>5OT1&cqz7LiWte6>Jj2(?NW!AyLl0NL*d>Zl$|O z4f`yyou!gnneA*ATRQjNx_A|FvX2wxBdMg4N*V?e{8ta$QBF z)JA$(a-_Iw^$n+@4cnF8Wk|abIf-WVyf8}t--`9{ z3l+spX6>8^r{`G=o=}V9$KSsJ5|2F#P0E)K!+o%MjcOiH>FKhmRq5mu3O@`xdd!pp^e~7KT~tL=Ja6hj!mM0nyFb>WuR1tzaqB#x;;WD#i8?yLN5! z9elYR%2jgt>(_rC04qNifFc$f-^)`kLWOFpPv3!d+_7S!wGnE=sqWced^4U2c&cK3 zyHYw1wZL2bkjqoALnpVLghA!z1Wa2C4`70JfT;V9@4N{2D{r5Ny9|1vubAh-9RA7$ zII0`vwpz&HODPC#3@eEHkS?TE8NLK7b5a0zX-NGOX+%mx>hQR@AxOVdo~WaHvUC%w zm6`ptHruTGG43>{0JzBS?WZPX(oa8x61~itb$JB`>2J5pQxNYu-KK}K8_zefx8208 z(f*``?ltgOn9lMAAI;_8JVN*JqT_TA&pJZCy={!gsIGK}D((E@Q}kb~aRK-A&|C#N uXn{VAW-&*L-AY9_HD=uoug{gdUK*kQVY`C1NA;^#^Qs`dtayg#HToAIBN|Nr diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml index 3124199c0e15cf9b3837ba0de4ef51d3fea08578..1d176017bba55a75f47b1edd0a4984b8b08744f9 100644 GIT binary patch delta 465 zcmX|6J!n&56y@IUOOQ0YhO`7JK|Y(RMI5?_r3MixP8}SiNEM0khgZxHM5=v+bWj`| zLh(W`h{(g1=pdow#aZt)8pJ(x^iiVE8ii( z#Wra2+!&p6oqB!(f~m_jpo>@Y!J}&}pbv#K8CO&JdMfZIUpnM_hMwJCuslL$Qq#j* z2dQ{GO3Rkh({bwcF5K}w@jVzHHZUjF^Xwi`0&a_0>UOQ9RfJxduJhPez5@Y@6UfX^(0=0ZQF!UnvS!F;HR)jBhL z?-i~~t%`jSPSvqr7MtjxBy0Fni9Os^vh)HQO6*@#$<%Ay)*%{{#yd=7XsXKWdtBH5 Y{eL67scchAGWZ#{RJeZ>=Np#rAF4XKQvd(} delta 2095 zcmcgsT}+c#7(VB;fD4MW9biEy&=6z7SaB4|rr1JQyZ}lBqjQP&7p&G&`vWsEXx!Z{ z7MHW^B+GuBXk1)OU`;$5Zp=jDg;~aoyIEpPMsyi-LASX@mc{Kk-&bsz4e@Fh(DR-5 zIq&DO}W(TG9(Z66XXNz)8W?cU1IzPaD#InSZG> zJqlg$H0X*yiwJ?4`4i2+na*--rYzfJ~+E$mobuLaZ~UQhsgJoQ}WJUQniZ#>fsWtP0aY+DJXWu(!Wz7XtcV>&O2? z@a9HV8AANt-mq;atX>)!ZVeyccPVzr|5Yidltw=YgB+z5C8WP6DR6&l6^McI*l#+Rm5 znRj5}he?&_F+;6T{GzXfPy4-_we~&7f<-bOJ8&Mv(>Q+JNOcDor{F9BTF{uA zUbU`Oy`c0SKt3@N61F?kR+n2EJ)1nRD$`Om`w&41mQ1e+EK;ozkLlU;BVs^{AA()a zR%PfU4$_3u)T708#FAClVgQ_812atx4W;{28D#zG)<&`kC2qoBBfKh)&y#lXk`ayZ zcW@nAzh5PWXJOPm0+G}h1R+8|>jqURObq`aVCUZqmGk!f<=i{im>vs_loY9E8YG?k zP+}v0keJE&t~R_tTKT<11OGNv$z5?H|1&w2YcFUeReWcJ7xMA`-#qk;XtoZm6Es=dQ^bGx9$w-j7Ur?NrqG+C_7BMzUSBcmn zt(6#z%Z4g_DTOivq1soeq?$M=wiU4kd4HB3FpJhXT3M9QQF`X+A8gr`z?Jh{^bR#@ zNn$f*SC2y+zCk_m(Onv(qUJ7rdnHIm;Y!v)Du4T(zPT(d3H|3+^Vl9EjR;>MtFr6e z>&fg{H7#nj6d;BX|q z2I;!ON|;QZWj`9Md0k)_S`_q?i|5%bR*?_WnnApCo|VgYFR+Iz!sg}3B>Rck@_E{f zJ*0-OjkKwl^K#1++d{>}r)-aKU1u(S(rJ|5bF7AnzSFEyoIHk!@_xo1KDD>qhP-Mx mv=rrw)9kh}FCZ(|qk_BuP3sVqA6#P(3{OMnhV;&|qwHV*as%uD diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml index cf4a64a56bb5351b04e1ec8d3d23fdb607affad2..bd86f5449289fbc107d29fad6e70ca9921f34501 100644 GIT binary patch delta 372 zcmXAju}cDR6vut<&MS{Yr6?gn4k?F-I2wZTnj*sgAcBSn7r{poj+cc) zbi)rCBpRY1$iZ9+u@C~W63j|bNxkjydEd|Xy@O+^8LDj z^zS?K_AP{IA_#T_FovL zTm{Xn`ih^}hh-{k;|N)eT#BxnctV>+%(Ch`R-vy)Sh#`}Jnbd*4(6<5i65BE+Qe_Y hgqb_&=X4qY?qNVx>fcLr(8{_zx6bMBgiV~n{R8Jin+5;? delta 1347 zcma)5T}V@57=FL+9J`R|K+zRT+7=d~=<#prh0+>ERNG<--bHhcw3e-DnM6bdUUU(` z0YAEo>S|HO$aB$+bRh%*e9!a#Jo|miF>%K+ zRji8Z_gPs40G)OTTrc=oD&?t>l644=G)6`8D5vOTf zEWYLCwY>;0;J`;73Ii~Tc!YWpNx1wyym2aGGps7RvwWY=TPSc4Qt1L2ltPVqM{6b+ zfNT=C$B<1>99-Qfb_idIDO4^*$_i2&Nc~TzH~Y2qrmI4hl%l9fC$G0qJNfj>A-B5^ z@-gIk@IH&n0W^>o(jSLvvX4TXy8=)?jq72GP!J?Zvj#1jiBv24VAx>}^s1HV0aYBN z2|UA~lQ*Sg8`V=2zMg!3BWJPp0(~jpn`WXcw&*`>l1HOD@U(-i9g&4?pe`yAS3Wc6 zjk%~X7iE>lOFVRpj$lqP>ZcJsbkr@Tax6Oeot24|hpberOfiR%y2qAWRn~43`PSr~ zrI2i40M2N5!>WwbGq&c}XF@7Vit{<<-fNW?$@?LV#YiU=u1FK{9INs6nW<5j>OWv{ zEyrF2?Q4j`ebS3^Y|<)mI;R3_CLtL^d&SqeEk~2dA;2+X zIOciRjxAAjuX%mZE<3q4Y9_xaIK9ACWsg0kmHaSU9=U9MT;$&ruN}078mR++g=VhL}BHAt50WA`%e|AqEn)L{mkGK@b_e#335Qgg_jG3M?c@c-D=O zzz|1~9&{-r9HMB6{(|O+28W;qslGmi99k~tbMCo6G7rkrwNeSoT0(K?W%;gGe|4tD zwZmXZPcPQZB)h?)orV-`N$u0*RkQvUngo4%?F#maVJ?QHn;hLwfkJ@^@N?}`DqCr$ z08UaLK|Zd)AjKq6vKAO1MFkTdm_WvVA}k_m4+U)C;1N4yeRR?d4tkyi3kB!kmRt?V z&53#NTDi6ieu+f&uy+Oe4Qc0i2;?71Z=jo^JNUun5c<(z7HpAtbR93DX_Tl!xWM%Y z#*qcvx|(j4M8HO_6y|v-ia8@%<+CmHwbr!Oes5#Y;3|(LvC&Q`DfIjudpBf>)eI&j sKHtYL$++7zYONj#In1^rOm*_EhMVnK@#0InC1ijv@)+r4M*(B-3o!wu761SM delta 1780 zcmc&!-%Ha`6hGg4O$D9e=9HY}R3uiRTh2L4#VI@&_0NDTELt z3orB_KJ_9*H0UDsU=Tzvk@PP8_#1jF?A-5n)~c=TExz#mo_o*dem>`%d(QXWZrS>q zvS(AJOkGaYs(u)TIS4`sx}bp_j8jcwpsXgjQu?~QsSm>7hgrCeUJt}!86s#6AU+2D zuz+?9mYEcw8p8;hw{W8Y^x!~19PN1+K}*2JdREzGE#u@=ar40 zik5jNjQJ?KL<^hZ&1SWl|iQwynN zJ(q}ivxqeFZA#SiKZw65A`2xtrK>}!s}vnB3M#HD$m#}36W>&mb@K_i@@%7!Xj!+N z6gDb1;YFuPZD7DWz?Bs1oAK3dS<{r6A&Dq1vi0_p6{u&*~slrjk mRgfzdfx@zdAJB$ejli)H4s(G-w_M=`n>3go^4en>B|iW-*msQp diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml index bd713ef65979f38417946b43de834875de033567..6bf87d17bb2e28c6c42416b049511443e3759bdf 100644 GIT binary patch delta 372 zcmXAjPbdU&6vz8MMZ!>uW@!=2Tz$GTEb1KstivLnEin<%#1Vs)6Q z?UC9ZocBwEg}BCEjNaoJap-J^EEUBf9D(rR+-38UQb3WHD9pz+H!VlwxL zXM^1vggE`~y-@XuB(H8ED3LFiMXVK4NaA@^j$hp4`E76MKA`m=ZP7N_rj%U;1JnFQUFcmp%%2bH3cGynhq delta 2215 zcmds2T}+#06h7ypFy&{XG=+2w2bj&6z{U)05L~3xG7|YQP_l?W3DORMQYtNOa-kO{ zUYQyFG$)xl@xoqcGP`xlH#Ko%7pRyeGUGHcYebVpV}en<@dx#J->)6ccF`MeylDIO zyyraUoag+!7k;_kC_-Zp4^o^S zr!Y=kP@Ew@J%;lPWP|t}#qBuc5oHdI5opFBucun-gFKFNi~=|*YxO^3OJ&dRT$eiH z`KHc1)m~Ay;RQJ6eeGY@^};d^ysQ^LEQ1JE;l&^ylZ7knHlMz~GBt2#vBRx=L}>uu zhjlE?)T)p=2CEMu+7a9h;(H4AUfBDAHBNDp_q)wxM?ii&2QIt_KCE59vH40@&5lmM zg`wIH=i!``hXFQ2)8<--SDrY|Mb2KDg_>fd2cHOq%xAkia(a!+Q_bEJMqwQ_Qe$ex zSHcBt)MS2tcTJTS=o1LL4?cX_ny}`?{u}c zb;IEp%GLuVr5Mg&cH(>p#xwZ!BJBYf&H^r`OB1D-OdaQ{EsFmTI0_)iD23#?McyuF z*SJ(CmhZaSncXa!a-f30PJSrwI02)L9jv^ zL-?T#9kZxe1jw#QWo;;t(6+6N$c)blWH#eTu%*mTf^Oa z`9X0cc?W0oDLlB36Xo0Wcp=ZZ>dsZ+;4LX+Y=$<>lv z;z~2>DKe9HIppJ)_!fy?;vQK&!?p6zPh4wNoZ{yTYV3`hodh++%844~Ak|y1ong20 zy0B#BRrW~7`*8f_BA+*ME?wsNouzX0BQCby`;Z$PVkCImwWL-qa<7pidYi5EGN*HO zaS{HUpD8rw+a0&(j-nlW&R&wYmbmI#?$J+qr*vH92W0*d2ds3OS2q{xLdo()_Uuq^ zky^q1nO8?`8ueKHmGmb0<8{7Ol8aoV6ULjSm%Ckhael`&a?>g&eEI1d#mZBUomv>3 zIE~U|#%Y%DgV?KhEa0}@dUKUqN}Sy|+xs@tVAdBuv!C-4O0IMHgu5S11odm$hXCw%u0^gyjN2r>#N~2m z&PdAH%Q&5wHs-B?aii4mvgYiro}z^KZnw3nJKsC-g@ossKzAGH8vFJ`7y d8t05}trud(Z#M+8ef1nRt{VS@W&zDz@FzQG6%hac diff --git a/PROMS/Formats/fmtall/BNPPsamall.xml b/PROMS/Formats/fmtall/BNPPsamall.xml index a12ccd115bca249201009dd4b26e95d8b1644b1a..859124648432b231348bb0e68cd8d79ddeaee276 100644 GIT binary patch delta 336 zcmYj~Jxjx26ot9>O^SqKGia(&ienM0(k|lQ6hxddcB-X_AOv(!a8Qh2@dJcv3Rj9l z2Z?JT;$5PM7Jq>{h=W7v4Gys8cjO-e&;qS+YF9}P?Qoboa71w!I delta 1447 zcma)5TS${(7=FKRGr~L!=P7IG1TU;L{^>kjB+X^mNvkP#VWc~d=9)TZniwH@Ar+$i z)OXtmI%pTc4}KRRZ3JCJP>MuEH+2yNAzpV8z2En*9OIA0VEgyJ&-*;@;rU-{xj)u& zpZiTLxMUp;parx<%B*TJyz07=Q>|!kiCca1FxvbPUl^Xosu# z9L1Oqe*>5u!gxe*KsUxGFj@^&(23C)K96H`MAnM`5k1PzZW6op)7)QZ_ri`=8>&Xr z6a}YC?I~XIda#2q)=vIaZO6`skTFv?9Vzrjv15r;leJdWX)DkyCFNx&MN^}2PEraA zH#Ez(kIRKbkho1!zpJT|@m_3f04sd>eFbSfIM@zxi5hVfYv&!5mU)oiG7@(}7kH6A zENK+2$C;#iVv<3wjg2i3t5-+(kT!q1LxJ$ZozhO*Tqxx*0;L5rr{?tQaAPW^%=ejelAq zL1${hu9Rz{c(at_ut(t&eFK^K^y@0DB|&OgYl2juXLqiyu-P?YW77%p$ZOnA09`74 zEOdmo0x+D>a4)(~xClMVUe1sj=8lsJ-j^hA3JW_hI)v}QpzbnWxlTMJGs-Y}kk4(9 z)%lVxJa$mpy%S3( zkLvNTZXLWeMZXyjqR4Ui^b8G~va@lNwwkl!r0V03bJS$G(&pJd$-NAd<^X*@7Tw#t8Ig;tV3yGJX`zX8d3On(3X diff --git a/PROMS/Formats/fmtall/BVPS1all.xml b/PROMS/Formats/fmtall/BVPS1all.xml index a4691897fe73825610f428d8b8c1d4c85a19780b..348196de59271deb3c404f9559db95cb0a75ce31 100644 GIT binary patch delta 514 zcmYL^K}eHf7{~d)`@S`Fhn>R23}o$4ONNK<6taVihzJo0=@1ekonnZGFo_Ms+72@J z$e#KP*(JSJRxl7R5&*l*kTKS20Eh(-|6^U8Tc9L6;XZ zwsyD=SY|NR(|sWAC>H`VZibhgZ?yy z>#yJjWb!q_L2ov}Nu?fewSf{>&!b;9H*gj{kr<-wHe6JKbu8H)%NI!g6SjQNDW9b& z-@hV-Q_zWT7`55d-s8e!#AN&jx=fvKRr`tit)r6sjdy{TyotAD`VUT2+x0s5MguMn c|HBlQUG#GN2u;s_&oq1NV%WpR##Y6^f6;r(hyVZp delta 2029 zcmb7DYfMvT7=GX0BnnQ4fEGHiA!eYkmRtCvfiVp(Sz9if#$BYg$lPct6^570m05RT zof&-KH~nGI#APv=Avx1eH)Bd<%R>Bt`(cbr7EN|B*d1}G!lk*ZUrDD)EU zq`tG6vQNa2xseY}VvcgI_?9(C&JuxUwS%l!1-0N*zA60y^Xf^&I~4MO7aEArDFuOx zg;u>;rlA{1dXPqXn}+j4h?>@uyhcJh2=fsZB`nOZ^;5gaRTfTV8^jA+)ja7zcc6(PxjK<1R~`$N7qD2s$CKY<0UOJ2ON&|q&%c5lBPFO z!RVv<_>DL|%j$x*Imt&l@|Cgj6K028UN1S)rTQGEr+RhOErf=+`yytu-->gUNX5cZ zmI}^iQyX&~@_?kfnke}!MFhxIKZMye&kHP;s8xP`W4iEv&~x99&uh>sdf`2FS5bAx z>M?^$wMaic`z&2-BwoS}#qC*-qFvE47MZXQ?Ta@&c6_zXizFlf@6HjpfeuT4Z*=oY z|GvGJtRiS4m$XkS$lSY^Ghbgb`z}$e3=EvY1+#;Lo3oX=M9lh3Bc*FM+9O?Kj**pY z*YJGi8Xn-I3AC|2LqQ$VF&1MV>fq_*f9A#%$4K|zIbOQ+p!(5!sBfRTC%5SS97~Ya zy6C{CI4ZX6#ZHSZvqCbh$dhN#DN>){M;3=}L8yirsDLU-|I_?rPNA74Z!P4pVZ5YE zuAzd}Pzg1nX#{^a=jk=AgbLw4i1|-3QVEL4VZ30{*T`w;&HT$GX7bZN;#u+5QCwtR zrq|L<8f!K4#L!o0H|rL3Jzz{7$3yxIvh`b>LH@-!ZV^*ga1wdyGpykS0^1IpLmyAH z;}Z7VaU0*S;C0<5Y6Ae<B_qTRfJzo1z06HXbmBF0Ih*pZ9) zflYq^X?lpKPU8x3;xaBZV2SZx@t{%cztha*rGMeeV(bqL8~UA=n<ZFft!xg2A%h?o;$ z!?m_Ul->A}bX<}3*()>KG|btWoq5M_)5^Oia3=|)A3aKotj^$5Vww;Y4|BM0Vl%{T z5HVSJL%3)MQ&ChP-WL%@OVx-~ZmLXE!(wR#TW!C-hN>*S<2X|E>6Gc?Rbh`weCzUt u#B95`WG6mkL}Cm5?aHTZ+&9nHe$(oM5L)hB(knLq9U}`SG0Pl#nEV6iyqj(S delta 1723 zcmb7DOH5Ny5S{4<5F~(2OAsp+KLJ~!KuZumu_Ck*1xi6&_-ooiQ7Bkj@wb3#{4T7H z@oik-#w8Np;%$s^VT?;$xN%jCF>Z8WOf<$2=iLVe&BJP%Cil)gbLO0xd3V2>-(Ja^ z*=(RazEvyQ-~fz51fon5-dtsP=qc9FZeh4$ZjY)?n&}X3=?!w}rU>sW#opIXaDd%UiRV^|GJtBE0 zRD&Cup<2FG{|K2i0w?&X6S|<40mGmIw$ir7BXwG|ABGr{gc#Qi!3fv(vTi>|2RYWw zu>{BB(t{eb%J&*uu(Grdezo;XMbLas-g=9L=wBBId_2KEv1wV=9Ot0 zm%dKAEHvwWSCr(e1q<}{RY4h-$-a-RjtC1;uJ335gt#pl@=>ox8!I3wnh5Oa-c`=Ygl=Z@)G%1f`#7rO;X zs!G3V{i`<7?metB3@86k-_QFo#LQ7%wvXvcreX&KxDDFsN61@br`-(&^eov)H8(cU zuJ{DarV8bWYc4EW3gl0KrV35+%=L@r5Qm zlhejUPwSPrEm(`n(`xK7>mnLdgc+66TKrvDhxnxFyPDzeH*-LGwudka3!4K|u| zF-=V9fktRr5Le*ACx&vp(v2YGv4IcG`1v2?F>-zfBlWFHY~YyEu^XS8D)h?Lv&&{x zlm(SF?HDoY(rndaOKXpyOPTFJzdmeHxg&}DQJPKRdnFz~1L|`A23E4Y_;MMXupqI8 z9?9>-mCEscjO8>Vu^GR@dhh>5suPuL2xB=B27@#f!|%G2tzWt-DTDNMBTh?G4Hzfa vr%lqD5&V`rO&cM%Y%%$$k~xLL%k)E=g~CmKn^U>QIVHuyxK}!K0eAcaqz<6@ diff --git a/PROMS/Formats/fmtall/BVPSAOPDEVall.xml b/PROMS/Formats/fmtall/BVPSAOPDEVall.xml index 684998892ee4790e3db86be801b502c8c157c5c2..fa295fdc73e7b6173bf5b19c618f11191562bb8d 100644 GIT binary patch delta 117 zcmV-*0E++6$pX^D0~b9@XbCxHHHag6$%Cp%6u!LD-D} zT>$0*wgD{0Hn#;w#>df;c5XuW$5JJD(H;lbt1a&dU!9)g= zEvOjwY%PZy(WareO$mM*u!+~Ut9E|XDr@91$wY>zTuYH4rI0kn>$_E)9&Qr1;aRiG zplGxS`UXDPsD1@m&%f)r{CYMvM;o~$YAyYa?k64W@9pEmaVy)8tn4wFINezQ>mnJ_ z^>0YM-yy^e(#nrEW^m;4>4d3HWTL*pQaepj5*+sp_E0ml%O^UVhFK^C?0}{XpkPHlp-Rz7-|o) z1SZKq@!-LOhftP|t%TSdGEhBZ=8kj+xf6F zKq^aD!)jmO`+hZgq!<#J$%twt+7M5VUs0(OQxH#*>uP1BVTgMdOyyX26C!tMK$xXd zs$KXNT`INri2hqqQJ8Cs?nF$KFCS8khv|S=$(f>J&#LO9CREWb1%*|Mi^1yl1FObX z4eR?kzl=CI{|u8s-b_;;cx@3s$(?@yI|}81i?1Y*L_?)NTnW@@w4Qxy@|lC?Bmj$pqu})pJOLRF)zDz(t?cl!oRHMQOfyOl?09X zp(9D!@`}7e^(Gdj`2zRlD~o=+b??jyZaFEgpQhxlax&1G1-HR7Je;DIZ=k)G4fi)+ N2i!9cK6a5p^aq_w>RJE* delta 2151 zcmb7EZERCz6h7ze2b*(&(S5j%Vl8ZOn=aj;%|c+VL$D}z-Aa%&U^3b{m9?w22t>tp zOoM+mm)GP?NK6=sQRhbr*Z4*S{Q(j}$Pz+glq^%g5284TiN^Q?J@;cmmg@y_bCY|| z`<&-I&pGGbQ~OJc2TF@e7#|KVE?)-RcfIO^lAj^;Yw%+pYs0w-(pROc%G%B2z0|*0t{-|e*Q|+ zHa^m{$P9Z+Wb; zLNDG8Pic7rbaMF79y+NuIhk1Q;^7B=D9e#t!znL>T@UHXViZegm8mu>DqH$2R~TFDRQ=I35` zxlU<%@FSbYOG0*%=^?FsX?hB21By{JB`zFB7Y|M@;&1G*E0_Jd8+mcdUHoXG+M^C$ zZK7^XeO9d`sCj*~4CD1R-2Zx1`8a-Y=^eml_KYmx)7#xVUvMtdnY-ZyZ8TXLp1O?2 z;uvGzR%qng3+@GT>-1vb>{?4@TC2NAV*+-})BXgl2CXF3@F^RH_u0$6&_hkow>`;w zT3yQ2YpYnVM@_AE2qlh6JyPMa`gKA_`ZoTIWdO6R#bJB5jSv-Wj4pT&%ig2K~5@L4?|0S%J%iqHpW{Ne~#9jr9^6L+A#O^UI3IPa0 z8>}>n6Z||gMFt5OfE5rlkogw25k+Pa-{e!r8pQCY_(_dfg%zO5Zbtd!=XlMWyLFz5 z?3Y+#Gqu$ws0AtEy@(CsZ)Cs7-;ZO|QEOJXm29=EVqGYsr!i?x=r`{hA-scH~QyO>WtJcA$D?f}335{_D{{p)8;TWrx= zPAey>*9bZO6C>7+e{y4`_`aSUlpR-*q3rw$hf%u!!Cv#NylH%r#&?gkieM>AT6mzD ze6f(_EfFH!&W^~{SJAGCJA%TyiX9Tg0L#c}H!DHQHc)cJ$cQduQPJ@ZE*9~7*{o&O z;C*bh^>EJAv+K9_CCoOmwC#4k#}k%SZ>*=F^^A+++jv0aovc%i2H4SCHsUi2a{ZsQ TS?*m!YX84C4wUrk+RFX~Z5SV| diff --git a/PROMS/Formats/fmtall/BVPSAtchall.xml b/PROMS/Formats/fmtall/BVPSAtchall.xml index 0c3648c902680f8f7b81601c759576d8647623d5..f085aaae1cc55f45e287cb3a7e318b078509b759 100644 GIT binary patch delta 667 zcmZutOK1~O6y;3bOr#bUL9z%cLmUF8NF$1LQGyo1O$aVZkbn|I#8nYNC@#wAq7~6v z^O9Z-B?yYuq7wVW7er7bO*f&=BGg|OL9`%338KF*R26^9SP=|2o9ma^s0d&T3b}X$zqtAA8<~Z70kfp95q~F=cQ9a+~~q(vW^k8 z^b;z~jVZ{U1~$5eUQoV|;u+b`ahe7vu!r8QV!cCPDSs;-Bcu|f{8o@cTe&(QMa~<9 aWVwkbI>7%QZhuGFJ^a}8MKDVJ!N5Q8Y6ENl delta 1967 zcma)5TTE0}6y1B65d^BkkO35jOvg6mVHA82J`|;h1s@DL)(43d0;6K#qEiRkCM7^9 zDZXJ7PGYUvM2+dg*R9;d%m+mDqwzycOl;vp6Jwf?8sx(tEpeZ7F`~Hx{kX}wXRp2X z+H3FA`*-ZIk=QG_HgdJQW|qJPXoOk_((_8UzR)%vms-vj2OtPv!Dc?K;ZOc+^z*to z=oNqUV7j{+b}PUN@G+no>KPo=KS_9yl3K(+^_+1K0t~6)%o3)rqy6iW--*cz``*UL z=S$IDzA=Ye7TpJ%6ouqp3I*WPG4mF3el6_fP&xRam;v=50l74gwS#VFIXwZE(!jh$ zETFzc zZB%Ayd@51{3Gi)$=<32`DqzOXXf z;yOhGxkTZ2*!O?449?nwmgs!0u?&_#{)F<#BV3PfDs2-l+HpA5O4|}p zop7%&I&jQp$({FBzj7t0vNmi zzeI%%VGbIz{=k+g5rPp{MCAyc>Wg4u6nmv5ll6(TJambwMm#NUJj9PgRTKKe=@DEd zj$FcQF?JxD@v6verJUoSB*GZ70ZF|mlkw2%jWm%=a8ye>8QFzONYpae?+~v$!N`e?F8Gi&i3vni z50seL=!GwtAQ7Xe(Luc(GfaFOfHP>X-5`XA;Y~0Mf>HQZgHre$g5Tytgo#q4hCdb8 Bly?9C delta 1925 zcmbVMUu;ul6hB|vbub;9j&5nUWn-EQLb{g8x=zKoznP(wGM2!Dt6bYlw{h2YU5gk@ z7}JOk#1Rg$;lTxouOtf}VNV!hjEPD@OnfmhMiZZW@>L(i-*^9v6)u68o7>y(obx;9 zcm90mvpc@!AAReF|KK=fX^zS?MjC!K>ZWlzL3|a(2G2gV8_jhMJ0mY<9Q}}() zRPU!a^>AeGJJn=^@P{q66Lk*WRjfmJm+)xdpwlq?k3*AXE!Pq(L0Uvi4V6*4C5I3H z9o{9^_WmN;hCy&1F_TD9xi-wmQLcpdM5X~c1BcUQ`4xT3x&lXK(`6oCl}JAg&>&w8 z4}~pH$AHK}H(L{Y64D%GDG(~bTfV9_i8lTz9OEnL*5CxxCDZi?XlTgd6eS?b^S*Qo zFDLv>PW7B_F6O#8o__uby7m{G>Z|Ec^(rIpv-Nf_`SWm)U)|k&%IcIE2@!P=cj6>b z;RSR~2VSL_qzFpTv)SFP7-!y`!E(jQLf@d!%4Sn^%Ai6H#fQUfb>S#TWXvj|PIlcD zg+b~=wG{=;IeDcf4YzLp532jzFx!6xpit=i@SN0`BbuQ`{#cg#$ z@Eaq|d}+Js3xF1aJr=~tg5cIMiHa%a5Sui<4kt~`qOv~zON1OT_Y~n&)yQ8 zT5RpK40ZdWsV${4&0w!!+F2BGy!Q44UyJx|e$XH;pS!I|K5!VzA&Z?j(dOf^H^56r-qRwDE^meC6qKvl_tVQF|Ge$hN)LCK93= ztrJ(O%^|UaCx36Pe!pGZY`Qt-`W*~b9@XbCxHHHag6$%Cp%6u!LD-D} zT>$0*wgD{0Hn#;w#>df;c5XuW$5JJD(H;lbt1a&dU!9)g= zEvOjwY%PZy(WareO$mM*u!+~Ut9E|XDr@91$wY>zTuYH4rI0kn>$_E)9&Qr1;aRiG zplGxS`UXDPsD1@m&%f)r{CYMvM;o~$YAyYa?k64W@9pEmaVy)8tn4wFINezQ>mnJ_ z^>0YM-yy^e(#nrEW^m;4>4d3HWTL*pQaepj5*2(!iuj2x31JqnX_DBzQ7DV~!gDp-@gDkQTK zD>4DIz$~IOlVEQUlTKN3vo>M;29us>8k4|i%9E}+BD3;oI0dsvZ#)9CqH!=Ov+SB2 E1FK9ZL;wH) delta 578 zcmaJ;OG^S#82y^C2Nu1s=pmIAHMFq@` zmC#Y*o+zs!Yjw*}l5Q@@lI)imDwn*3ddcIm%F$mVq4rvzT_{V$bSu zzm6y-olz7D3mOxw?RJc6i@&LX8fK0)u|m8(XcJM0lhOu8uop2zU@y)Gz@TZ_98C6OqBlx4rh&a)dlwEk7+kP;R)dWUSWPI(j_ z;K|962l3ARbeS_$wqW$sS5UTQJO%!3CezQOZIZVC#ED~c!a0qFwD?B&QpV?K9-tLE lMtT9K_`VrdoWB6M*OKK`T{>o(lFN@kY43K1zh4j5egodzg_HmQ diff --git a/PROMS/Formats/fmtall/BVPSNIBCKall.xml b/PROMS/Formats/fmtall/BVPSNIBCKall.xml index 9f39768585da7a4ec12b3de3d7e61a26a07d1a11..150a0e992a7f8ce0885f3473f5fa89852ff32abb 100644 GIT binary patch delta 410 zcmXwxPbhD3DsP zB3c{ZMNb{Er!G{Am);6~^%YyN+otln zuZ2+7(a4Wo`*uDJ3gVYuR}MD~TnOBaxZn@1W?LPaL1d$z<#3Elk;2@#L`$m=i9Ro6 zypY4APsDTM$CO=k&5!V?y#@^(=_O;eO&^c2e>LRiYnn8c!IdW8?>H7d%lGBPHc2Sd%Cfh9Jt9Hfiv*yOs|( zZj%*_UkaBW+$LxUOamG|t~q)5hkXqPf=E08(4c0om>bcv0Ly6D1b)>STBw!0RL4%Y zx5>adikv9C$G1@EfprYFBcPQ6UgAw5T-@t!jTg>VqvoF@DGI z+G*;R)t~Q#s`u?3bNp2Zyz7jN%;LQ?i)rK(1p()k!dn=DIZi z$*0i47!cK&2dEi()LG`3b7zj%zva%#yY6POBcr<&qX?+Z^pyD3V8u~<7#1ZJ#LCLA zihF54L|4TPzv(l?*Nx+u^VPCq|3npk6RODRp^^`hhdgqz*I&qQ2l8EQEX3gZ}F*# z%Xu*eczxa{laou1JjXwh<>B;MO{91;R}Y_lrHN}MANg?h6MK_thFT^`%*NldVr(LF z^84VQ!yD&I7iQ$%lS_i{KVSB!5fsZ_LAAP+6cH>NTmv3_u2~V~tHEx$I#wij?)1kh z?Q!e0DI}?dpl)YaI?qfBKDl`7etak8UG z73#ERmOYRj+zzme;D#H6ZXWq4wu9Q0*q`$5IcYDhp+SggZ0V@HbfMq2W0QeDXe^Om zU0jNm25?)VSXI*yKSnQU{k*bvqe1ZP(TA_Rzgt|B(VwpsxU2%7pcWk}_x^U@R&Et> zh}v*xYB#n!BENtx;h&=;tk+;KX0psf>@buVm5Lqem((p7l{l284=pISn|C<$BpNedF zm+wYzC@(lWw)+J}5=3lBVKthR3yGCjnp_~M4vP-z= zRE*Hip_von!MT8d>#&dg^XF6mnfPc?6X6RxjZYUiY;zp1ZbcZE8F-~4Nv~5MVkbeXQ5^9piWn(#h>*&k;l-ydn$0bBqtB%~++`aXD)rSy<94rv0R*NYAdK_ML>YrdWq;epJ5B32PLo8EgC#@*uui}>4DxA^>sP z%||?&xyHM%%DShB#O3>28Dn*n z)j0naJA;#EaNa4JBfmK6ZBe+r)g_xZU=}t42??WEC>K)7!b<_&)Iptw0Ml>z%<_*x z=p6s~exvxjJ=egG{9CH5TFBttq>?H&ydGG?kNQ`;y2uAtUg3_&D|~uz8)w4X`N3e9 z$b{S1ORBX+DslWxw^Cv_5q;Ipv+-rb(*AF3D-HZnd=Fndu<$qA{@5HB;tkcMDt)w< zI>g=B9c5L(*Ao0pM=0^7ZKZ)jiMqwNK2uiNcJXj>)0vTW-ju8qu7l^DtNeB1rv5>R zToE`_y=G@q*)A}*ht<(R6nqwMhKDM)irDNr8=o4j*=mAP#UYXFMwUN;1%dYFUA|fo zo7-nVTgpST0Lp>YF%_B&U^Vm=H_Zq64XuYA?_85<{!grM9yw#@f#?=RrTwSCmb7_Xav(_F4d&07sqDD z`1_L{UPvF~+`@W3ed-wha(EkmxA5VHmDqb8w@9D-BIzE&&?Jq090sqs1-qAitx&v* zP=6kF)RqIhOr1r@`NvOfb>$#?sf*Mi==PHvw#IUxJ(wQ3axq0Fbm_872`XIq+b5iU zu$?bGU92w`*J;Mdm>HXaKKG;V>^YmVSXN6HnqNH&aO;w8S037*3tFo*IR3lf0sHer Hp0NJ~B*Vxd diff --git a/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml b/PROMS/Formats/fmtall/BVPSSAMGDEVall.xml index 146414c11b6e41432c6918f6a9e93799a470082a..d25661228d3b2b903022c552b0579547872783b4 100644 GIT binary patch delta 113 zcmV-%0FM9G$pYBJ0m?M)6MGBKXFW{3jFrJe}F%XmfFi4Y# zF(k9xF){(OiZh}!lhAR3vS|DUlSFSMlaz13lXyTPv%GLP1(UpGD3e}F4wFDK1e3ma TOtYAFwgIzjcr+=qx}h8cTM91s delta 632 zcmaKqOD_Xa7>2(VMH-csY9f)2ONjfpg+xTCib%|$lCCVIbt#={sx1;r3z1mxZ7f{U z@B<_hZ0y*GO=BT`M9W|Bo|#HSL?&l)=KbFDp67gX-XE=R&(@ng>q&==U5cy1PcyVh zVOpjUYT!(^ym3bA2Nr+ptfY~I5_>O(6d>pINCHrZkTa@E8kN37npne)c&TUuT zIYUddgNj0`QR(IL?kmq2_F6BfKCFrwHJOLy#ZJ>3qzF7oTB86GG(e02V+!gjv{`5g zXfdw5bn~g)F@nYn7IP640?iT#Gkywlh%$6Q6XD4boo_4Ub(sq(=)?c^oEcTxsaTyL${jF{l UKO$`07zK;X3o)qQU(^?U0S}y&Z2$lO diff --git a/PROMS/Formats/fmtall/BVPSSAMGall.xml b/PROMS/Formats/fmtall/BVPSSAMGall.xml index 500af731964173611415c6c431deb93ed91e5568..3830ed6c28a528c80d9a33726ce3bdfe10649d11 100644 GIT binary patch delta 556 zcmZ8dUr1AN6z03TyVKgk9xgH@)_sssW`TQ%@Ils_4>CrC43XHwlAgw1f*=Huwu;im zPVCqo!U`-xLHva$LS#fl!G#9Fh(Y!T5h4f`44p|1y&-4 zN*YeLsvjS))tED6QSjn1wHkd5Dx69w=kyRLd1g!H&Mx_=KNC{v!A3uQPn@9I%muYM zQ9nu5nGuzkx)q?|d@mPo!lX>zrP@`K+;~LI7p|C;OoU34;pPf$&qiq@H%-ACi&VW| zRN2{77unobD*sb9J80pDoV*K*x*lb8{#ZE`w;|Sb^ah^m2u}Y*kV7lzk%=i3%x0?( zGH@Gz!I3;ZbP5fljYscc-NPdfu;<}vf@{cR88K7VDj4?2VhgDFWcwL{Rx=);dvnAo@XZQ1U7FL ck(Kl>SZEI{{l>dPt1XkFP5$xTqorky|6wW7UH||9 delta 1997 zcmb7DZA?>V6h5ad6j2#YpkS@7pdg}KMInT!u`*0GkyeXBmQCpjenP3W2u5RCQS^sV z;dQ>zUxUQNEK97p$=+m9qL^(akO)7v7_&r{;g

RDYQL*|PKATR#T3;BwREz2|+- zbDrm%bBCUqze||oOAOXpXoiCjflt6s|9)^lEo_H&ing%(ow>?lL*X1t9R(uL0!N{q zPFv_F--E1uTLC)w-K%Id`(eKXuvq3oW#imcIR!3grKcS_!ABPX!Y50y{uNfcPvr}} zj==^fB{N*)XdP5Rq0+znd$hPn?pjBmY zGJnbEY+p&X%|~|Hh|fj3-DGk<8~`uH!W0Yg{$rS{43<>mg5C5UCOuNqabh9k_bS++ zJ7R zr48y$geIE;%VN>7ni&Lbnw9%!w;SfZ z6QJd{u$8AGO3(Rm^9OE9)0QqG8^mJ0Wo)GH3X7Mevn_pDY}4foR^3}S6{o~{OK@s1 znf#AV{DyMi%E*&k4=rx9`gzt--A;8RYs8BaSc;-Cgs;+c5#$s&g0`ZF;9d# zvBzZ7WrGT+gmPFXbN(>Sj-q?4=>YzX{7xLd z;Lg*S&!Z3Ucb+|rBUhi(;o>gL;TZ!ssmrfs|7J>c_hwjvhBYz!OvUIe{CWmh8H%sI z#psL(PKY=k9KvOMG=>gQJ&5rXJ(kURXPfdx))3aGAeZxKm=h*jcX zNn^gjE2Tq-qEJMNZ@3N;q<_H;4kDpsaF7xtql1W-k_=s3-ur&P@52|~&-e1*n!Ig^ z$clC3r7SwqD!wW@`|^s6;zWcuM;ijViy`DR4ZB(t+nR&?*cAI?9|Wu$Sw4ManeZ)~ z=SXCRuyOPl>=6kWGs1=F{wSJO3|on}!A`;tN!UDLVQ;+7O)C?}^QR`9qK58g6@P9R zsFshTa7luFCyd;zf_G^XT1Mw?>YVsLn17`kBJa(86i_PZ{hBwuc@e#N6ZQ**?d+F8xFv>#-+`ebVa>q`ktKP#cJ6Fi<$@g;5Y?{Z5DNQJ+@Toibr;t&=p3HH~b z2Lk?D&9%>x#5=DXc*Z!zCAUAl!UTmSuX&1Qq<)+rFLs8mivz8tsYR}Hg>GV_8+U(P mpihHK=OUdSQnwsx3xj;+GVKdq?J6aQeL=_ckSxv7lJE~(P{d&X delta 2120 zcmaJ?Z%kWN6hF7`)#0Fw(zRq%Yzu*{aj*h~;pT=d6wvW^u#jn#6kZE#rDdgK&O~N3 zBYyD1!kN}3OC-@~;)g-@7BMqfVq#28jETm?FD5SWgT_xY@$=&EzSlw_&!uU(_uSw8 zo!>e4oWtWa`(K~iH=7jxd92zIqan(WMhQAa_4%KU2^TjhHxK)%hvq0wX`02+IOXUn zrLgJ)I7=~F#yU$^^MMF145$^pVI1UOT%rlABuwtpMJq2%*70}Bps$oR3J2K|awy<( zl}93QmBP&{I7`qBcw$gEkH0{GKTDTkuO~m1BBl35DJ^dTPdWuC~h9!)AR~hvy|bOqnoSN z)aE7ZhY)`XTIOjG-!v?{?-ckc!I#ea^qY>`wweeWT%fZw3^zR>P8nf@__?arnoa8@ zs5Fqy?Fwc9)>+s_5nvXM(s^f4xbvGwM5X>=)$77rR1l$Q(8{tn2Su`;vfIVM|2n5z zi%f$!lCV@kO%&@Su1fX@l6MyVFN17}4>%9G&mo~^{mI9jKzbGtmT%g}Wr>RaJ@q<^ z1v3g>nWCH?s~!=u;;)(EkHgK3;S@o^u}qJwt_})O3x$o>H4(*AGffka^9Ir+u^|Ix z@=4h{eCFvURQF^_=T}W?!*{WQZ`Z-ZG` zBZXlr3t9G6v9ygE<1sC`E3T=x{_L?wt6(#4EoV+u1anG|%qS57)#cbu1ryKRT zm37tOr!n-SIovhWK#gAcZqnu)0LmNW%C^u zo6^lGM^zX%hwYxh3SsFTl3@n2T38@lqtkg%i8mL^SSP0(jhZZXgJ<)*>mAISr`-Mq RQVP_5=|LKl)%4Vc2>>sFIcxv` delta 642 zcmZvYPfNmZ9L68rtW!sk^3c?ir?k{fXo4*xqG?uOSJCx{Y=KRqm(Wqxp-Z=3K(JF6 zCF)WTh7?p#hc3N<-ay~qrV#OCY<&0Z^L?J@x3dSK+ZV2$ec=M?*n@>dROwlTgaULN zl4{r;IcN`jRzyOP6blB9uu0Pr-R#{QskW|#oK^pdII~V@2^F%e6R?X7vOJ*0JgqL1 zx;#`hNazG=mhW)69W9~#IZ9wc|BD`k+6Ge+`dz%#)qo? zp?+(u6|?pB+057)PAJZ#Nx}k6HSGT*DpZO60RvIzCU+rDNGPK_y^^UFVcj?!|ph_xd~#;(bp-CZZs6muH>M?Wq{y?p0iJd+n#0dcy}WC3fr&CApk*f;6dF;CL3 znO-N%$hO(axXf^}OsdpmyVPfszi23J?n$d)nLLk$ZL>yp8q?+_xeknzm*lE!mdn32 zYx^-xMis{GX55SmSfFe%K}H#7D7!$EaSlv8Oq#I_#+FcItYeuD)El*3OpS38Sot@Y jCKi3hM@&!y42&5yVB#~(8FgT64jaaQFf}d?jA={&kpW*= delta 1601 zcma)5O-vI}5T4g9t^61&6&ppgl%Qz@Y%7#vgn)?g2Ps$*4kpS<3stmW3o0>cH1Up% zNe_D9vG6x+qk9vq|`QL38tW*W;~0>Z2?`IhsT|g@SoH zh0|UXmg? zd2J!RtNc?bfb)QZ1tO&$siA{fDW)!B=IxxRY6R%>P^Hu=l&StOTK!=&v(4a1fGt7I zJe*!{+^AgC%6b7CXHgxf52EQDsHT+xIht(h4u6iAp8fw_r z;^Cf}kTF~Rs%CYN2Iv4@LdUxl_)JATk6k^$8!JORG~nZ&tyO&Ypoc&1ui#G$-73D2 ziSW_(5SOYve7CW?F^G*l4_ihA1@yHL{nenBPcb!*OezRjime~IzB^?kI@^fzhkM_x^ZS}$wdob&c- znp5>?EX+^FHmqJ5{gG&4-~1vE#i}^CeO;e9HW_OkjijA5hOUy#Ved3n8!I>q3xl2$xwjplw)rzz3 zMrU*a*bY?epg1Kg{6d|$}+M6Y`Z6-qFJkR>WhBTD68lFcJb5YXt}NGWv7^M F{Q@>lU_$@^ diff --git a/PROMS/Formats/fmtall/CALBCKall.xml b/PROMS/Formats/fmtall/CALBCKall.xml index b77bfad290c91ca7759abbabbf4b52455200fedf..e6dbf06d73f33bf942bc180516fd642f5bb19a53 100644 GIT binary patch delta 377 zcmeDC%XI7&(*_6j$wll_CR=dyOlH#&n5@BBF-eqba)SrUWCul#$qHN&lYJt%CP#4v zY?k8Q#yI&6kIG~hUX#hYcx@)1;iC&g4O0YO)cKZ zUGZF#_nFIE>qwZpKujnK{DgX zW+m??MxgUFCO?q3*lgh2#WGn=R${Y2&?+XNn>;4h$wp0H;QV9qvalPIeBCz7L|kG7 z(LGUVER%iI1uUCuQvW$`p0cus6-cN617yPmCJ3u&%Lyo} NX~!X^%_+OJm;nuRnL_{o delta 1768 zcmb7FUrbYH6hE!S7Fv+5KrOXWW^^+FDHoxjPN)Sk9kd`dD)MrL2GCk-Y5nt}%xuvY zjd=F77^4rH4<^f!Z}H8CC5u@W6Q4|c8gtpxwrnQG7!x)AzVF_PRf~za`EGj8pWivZ zbIx~q=WqMP7xo|foWTK_qFE|XKk0bu6s7?hrlXLixp%CduQ^w8zw=Uam=cf{C{1&e z!mmLb`JJ_-Z1aTp59fSqoMwQNrD@oXQIU?|(J4=-@KwM&1Nmq4F}34_`JvOd>P>kk z>znF1=Q?>HOuJ#LBbOxbGVo2|Hi7fjEqerWIleQHsz4S7n<87lWNn2UT1d zDGh`S%*PFt;~jf|msT8eOEG2?p-3K^Apgqz(P+fr~m3DA^k zi7b?1T?AM`!Aioicp7z5ln2~Byun=?Dh>KMe5cWZ5hRiaLY9*^{5*-$}v~la@w;WH2HQPqYIY_iW`K#^Ulsbr2y%!v%0yAZ4 z{Fk`Ze^yal;@&#=#L+4%Zrt0_*2)c(Cu`h?Fe=A!GT1{+BJ#ygc22|^LWWV=ylK)w zwsI0{1hdc0``fs-qni_fah`8%Q2CxtK9HX4%6rOHCKsE$hdTV*#r*Cn8|O!#f1uO1 zjtVtyd`}Ck51aWV6@@&qoW)&8TMNY85I<|5yivH;!48gmeU=~9d1UZ-`HW4jYH)WT z`$^n1W6-T??8UZ_e*svWe7kPFXxVqoQ5~jHTqrm zF#~x&_$EIxeKEPpUSP66%V`ZlgvnKe1t=oHxH-zJgK@Kv&nuS6 z3NjLt4}^(r&Ip{sH2H$I$K(c?sLdZjE-(T)0+Z+ID{S@%e}Ulah^%3m9H%BXd7cB? zWwHS~+vX!FKb$vTThYS`BvcqTFIs`8Wcwke&C7Oa GF#`a`PKZa|I5WRMc6D$*qQ)8tj#C;ViF-jdfiS2}7YD^+Pwx0o`RHZ^Vu@ydCH+^y1 zWYG^*YSk{%)EYtNSxED=vvL>~p}L6^r6MJY`{tWqdX8Thq)UCJYf4ThYf9ZaZp})(-{fO6L+e zP5;Rf{O93+68u?2u7fd;jOI93$wp9(P`}9 zTIMPCMGyJ9-WfgzuBxhUev|()c$hVhcL7gXRh9wMBu*;yB-RtOV4X*OWz<>~8K6{T zIor89kyfu2#(=Q`l%SU_DuLfFzu=@y}1Sm#izwxz0hWEQ%jM)@TV-g~T z^MAVesI%!#J7X{CmGr*N?`V2iHsbF(7=+o>{mlMDblnKi#M@rlIPa#73vTkoD{^L} z=xForrQZ@?(uu@ZHujfnYfC*P#*lh~%DrRcJDQUhQ^)No$H!OND3|5LVY~RICA*JA zwz0@)`Wsi9J2C|_o!#%;Dv8Wb{_Ps%o6y6%^>TR)S)$eTIb8jRcxzZj1MxproyV~1)>x|a;B#9aq?J@V|BswxYK^UPN_*P3pFJ?S@C$F}D9u{21& z4?d@jh?ld<+E>*SL3KK>-&t$~9kV6VG`0z^P^?vXX!?O`S6H0Ju<1FgK-_U< zz(k%EwK@yHexxK$%ELbmIOyTHkG{RLCLi5i>j>K6hDBT<<&D+H&R#pj7{+Nxv#oyY mr@O1)$=na!&VD=Ws2IZdrSNJG`N^I8&X654u94u4cKi$B+NK@= diff --git a/PROMS/Formats/fmtall/CALOTOall.xml b/PROMS/Formats/fmtall/CALOTOall.xml index 16b95356420c7a685233458f92cfd88bad90202b..db3d84241a19ea4f63a0d16891f2df880f5a3084 100644 GIT binary patch delta 275 zcmezMlx5XTmJKhMCQC7&**t+ofqC*Z_HCP4IL|One#6x_c@MY6W;LDy#?4NA6PP#K z326y$Zc&}XIC+nT#NP`T|w0*qxa_7zdaI+p1`?NQVDq#1d(-;-kO i0PFb%(|Jgl@evc$ly~ZkS}^e#9mZcU@hJw3X-oh!tX^pV delta 1444 zcma)5O-vI}5T4gAAVm;pDk+6nz+j+6N(EX>BqCsp0Vay-(8G zj*V~oN(;NGmu4tV3Z0_r^pb};`Ht=FF)ww}7|E2NQG_C-(mYM!bQa(wb<K7>?Ur)Ur-0Tlle*;_8#o$0;fENbOX}r|;$S zwUd%|yI|R#(*Y4NekITC>43K?vA_z{4)wr)Z2nXm8_*wpZHgqYJsb*jH4U zZ7vHGY2q9gY2dEYqQ1EO|DZhT8`e%Y-fha!4dPo-PmN(!*j(+T&a7m2!yNvbXdQna zEziqt%-86bPGhc$xg_Fw2!mtTKJk3S&WTNq(d0jfAv7ymR;XHgC$C5_s~>h6k0`EP z8o6OBIftmRTINu-jj?WKaa}U;;*KkfC5`K^uMc_GbREr^r(RaawB5Z&QkfN?iGl`% z-@jR!-gUFp%oJn8HcPgE0nPl7*h8txn$C|k2vG}Gwbdm4xl+3Pt2Xn^!P=!7>!c7; zf=E0;trRkg^c1rN>mto~&TTpx#nNc-aysf_2Qz*byJdG zak7hp(B>9_I_AxJB3ii1WRppFic?vF(x}0CT)%~ zEi;^KlP)zmF8$eLDQ%_AYceWWHaq3!Fl|1P@4z_uNWRKuyF!WC+ttJwRT#HV;bpwX z0%dO!W{hG6u^+HPMFQj)r@>^6R2b*6Z2zXg_y(*7s8>ag@e&hMrJWJuBc|>2;TRL*l|Ok)B7(;Zd0 delta 1590 zcmbVMT}V@57=AxDF>{jtW}+T{GM6)^&Ur=%En7&ft(;(V6LU`I-(1_Yq#%UyA_~F} zT3~@!Azg%UE(XzsUUh93bte=>P!R=QSI_sIvs!VkVsQA*`#$gUKIi?OcMpGBZ{022 z+_N_MXq=`fO{XY~XP6Z7(K(t&G)e>1qP?{iu_Fo%QVhvBO(GluaEWGdIt^eF1&cT* zX(_YQ!YcVA+x}jK0!XD1PSFTX0w~_&zoXzrGz^*)P%WfnW@=b{QCN0J@p~s4w7tSA zOMQOhlfWncwCCTu>Ud4@Mxp4C;5*Be!2m7L9F0jiL7D(|0dGQZloC*~gs0FXx_6UP z^rca7h7k|pIftwld1EU4O|e~jUA)O^y%@+e4db(dn8iF~3koM+F5!Hoq^u#ocnAZX z#JtW+xlxK|wo6$xud=DNA@m7T1YPvei7ACB%Gc)VHNP#vZlC?M&ah`g)OJBLsb zf#@iHamW?QgqnUjMm_SA^n5O-s~!RR8d#-niPG7I^Vuqlv;#yc=u~p>D-(6v^U_s| z$BV8JAy=xKg7kQvHZMk(6|uki;_NYx+Jg4w|&)`zx-%rsX~4_gNq5{ zno_*{tVdgKOR`o4g~E+VJpCAF98E{1Ph+xWiej*chX*{0cBx${>J$zY(-0S(1fTw` zxe`Gj&g00((8bOh{SIxbOSSw@A>Zn9Yw7OA?m>NmLBsz^*+H(2VJ-7~Zsl|beHgRz zPh*El|Bf~v@8ZtutGuz@#=odFgSuU!hWEtQiRuUpEw)nFSS&|`X8u8p!iQqLv0~cC z$YU!8egRja@8&pWSgYNMO%#+50inCraESJK+Q&@7owMGx>LC0-E*Cq1x~o!)E4$pl z>@0hKAKSIonjyNWU&rt#w<|K!9c&|`9A<6V!~u4rz?8Gc;4G_TFRabxoKBcZr9Qad zZJ@s$WDl&Z=4chzepK|5n^b{+S!l}Z!ry~O;=rE)?s8_gmD#e-TG@)F&Wzg)-kjcx z9qd&>lNkya$=pLuLv6sp-W8Z?P@%CODxg%?is_CxS%<}Rx^Bwdz`Be1E%j#I(N#># a=v?MuKg{QDXv@5}uqt^`*{=iaDf5WI za-g^n5jVP$!l3(Z+z5hu5x0d>x>H2d@6Jq+=xi*PT;`tpo!581nD= zb2LvKx+qB~}|6pc}aM|@}4>)RKsqI_|i2ktU_8)&d%wgeAeFUWkumwi~K6<}Ie^MW`u zqT58&ahgL`(Nf!tUjwQOYXnpaT6LO&mrjc&ve$CSBySeBmgyCyC|#oz#hm;`k)nVU zU9`}f)ZYPYcYf@9$=`Ml&h)tcGk1%yDkfD&QVmPDNfHw~PA5T3(oAn5dbbwcHo<(| zA2PCgSG{o|q<$9qdn+PI6Wms)#gBaZxuT?btsLg$#X;WAWsO_@x1QMlgpm1NG+-2! zQHh_2e(=rUDsK%<>?p)11tkQ6Lg#`Biy84Pn5aX?&^W99hOv-&CJE@UGgOFQJO!aG z6%Gl0t%Qy5#>ob}F`M`BDll$t;r}Hu`I?Ks<^vj0jFV@5;MyFfCB?e= zkp4dA&6kYjm?uB;lA4@gB(T}X+>3Sc2|KOLpKQFCz>FF8(}aKwjm;fF5loXm=nG6< z=O-}P#ye^9pKzDSXF``v_H&onydlhsZE{+y)MSBJuE}Z98j~-Sn@u+O=rB1TObMi5 z@`fFAZrQhL?Cq0 z+eLH{{Rb7_KTvljMoCv*bfJ)tkd$?`tDf(iO{f+!l%zTC+A8Lf!!}Jfs1r!T$V=ci zgVzU33_CPOK58TnA2K&ObcEd+pdA6}DEZND8xUlUL`%Y!;9E(-d@V% z`{o+eO<^{~N_n>6syztmGYCym5Xoa$@`U4b8*382q*mTVr^zMW6;vDM|GtI*!bZWP zn+CM1s0%i-Tglu(Uc9YoZ^ol{(SyRX=?#<6l8OjIkHXsZ$AWtSDJ) ddC8+kv~B)W_AIEieSK?F$=a4v_`fcyzW}0lWFG(k diff --git a/PROMS/Formats/fmtall/CATDEVall.xml b/PROMS/Formats/fmtall/CATDEVall.xml index 7de7047af104f2baf2e756cede0edf0205018af7..891b720ef81d2564f7897c1151c8b027bcded4de 100644 GIT binary patch delta 119 zcmdmUi1FDT#tn}cCyOu@O}0|u*?fd)4ddh(5w6LTSlTA*vCfCJ3$ VDvX=&g+5}2uvnt+F#%a-%m9ppDtG_@ delta 621 zcmaJ;OD_Xa7(Js?QE9{@P7=vp(BU>h^s_c4SP^kD!k;?t#K3TYgWi6h}K zAvx8rYKCdG`iYLRYTe;X342prt~QB0H3h7|VuuZmG0Z_Gh%OVGCbmOtQ<^QqKJm_J zV(NaCL?-o;sD+F}Q@}E1rG_%On%GWpU$|>F%T@<8qe^;O>+IL!hITpkR|iyR<>St% z&ZhLx|G#k*k|4E#a>4wm*GIGD^FmLr91polpMyn=Uo?=BH>{3cgR1q zavOde{bvZ~P?<(}9T}|s7&FO>Qhqt6y7jl&=lw?kBf-1QIu9Br;l5VH?pO$F_N4XV p3H-{V7lQ~nDv8A^Wzl+)vDBO0Ij?Jtzg2_~Vnr_^=x0^b^8tq#iY@>E diff --git a/PROMS/Formats/fmtall/CATEBCKall.xml b/PROMS/Formats/fmtall/CATEBCKall.xml index bcc3cae57c0fa389d82b028b0bb629a9ef79e416..d31a021c24456448552449021c94332515d27daf 100644 GIT binary patch delta 201 zcmX@{kMYH4#tl4dlkM09CUYtCP3~j!n#{)DG5L-j-(&-2j>%d=Vw;&b)-g|x;1QU7 zhg)Q_3XjQV6<#^U&HMODxF*ly5u1EZSz_}%$rY?1&gOf{+ZZ~ljma0{$|g^6Rhqm(UuJWH q?*oO+DkUn6o9ptsSb(f&%n+_mEZ@j(HOy`i?*@Wq*4=X@(g?IhSq4c(jZX$5nOjibL5ExDh9nvM(#L!L zxcS+8Z{NQXn0x-|$^Qs`rJ1$Jxd0nJZ$Q>m^jS@jyELJUK4VIJ*H<+^twtvVdTcyY zc2_o8)}v%<=NlT=Q;+^4VCdlY{-fFwzxB^gk9J&5g1hUB;VrC51>7~P>;QQ>IAYO9 z?}2ZxKTnO)T`t9)ZaR zxWy*3@fb~Jd%?H4gGYgJ@+;n$%_V$FjGOHQen~);^Gwncn9O0Quz8avP=ZZcg>`d{ z!9M2AJtlI@U?mr7QmG>37rgJsL+ zOW}`LCo9BBO+FRNHQ6UlVzNbyz+?dqv&kF2DNJ@KQJ7p{$us$!gT>}$@nRjDuRXV6 z0}?8Xn*-iA0R8Y>X*1847FLMRgfigd_F@AwE^|%?IL774P cjCRaGgRX6F5N5mwW=#jO8n&O4V2on|052thhX4Qo delta 1631 zcmbtUO-Pe*7=PaF)tq0bLrq1U3&oMII<=X7h-(^Y=Eo+PQo_=umYX_1gASge4vFwY zyNPxXp@_jtdFhac2&6-F=n@DD1zoIzhYk__{_nQRm{W-Hf8YI|=lA@c@At#1{Pcw! zT+$ad(Ett8BsG#7PdAyUi7wG7q#im;W?p}9ZK69C7zWr2N2; z&kb^`#X&>h@zEf#E}9}Qes1#9ZQLgD90@T~ExW&EtBdly9483J*nP*yWd=Vl^`#a& z;jWz=Fr0$XF!a9P0d(U&0O=5?TMN14q|DPPM|s1rnQ4doCPi#V;Yy^ioTyl)=sI

&erBU4l0%EPKjA!XGKOV zu$okAi4&l@7>ru5PWTc9_o7vzY9i1syr)z}d9D9H3RaYByl}AqSte+qFIxS&Lu6|A zDe9@37A=8TSq7{|DThs`v(#sGExLnh@&|1`^C;tR=wM5hy4`kJmo0klp)t(F4fI+R z%8r$Fa;LqCU%3|eXXi?xSWYpgq5elktsl!L7SpUQJBQ;PA!R$}QIPmCmEoPoScnme zu8({#v@zni9t$V-cL|VdHnZ zFLi~{5LMVT8-BGBWbpgOe#lxB--c5e3TW}iTU}JIHmcDO&*!Dx{kZmeU0ac*&$_7D hg`BMg6Qp{5bO0A^e+BFSx?g0kWB337 diff --git a/PROMS/Formats/fmtall/CATall.xml b/PROMS/Formats/fmtall/CATall.xml index 423c553b37584c3135887a960344f9826909bd50..57915e32c026717a00e8469ee6e851a74b07f2a3 100644 GIT binary patch delta 297 zcmbR6j(OGt<_*7?ChIUynf!@4Vsgh@fk`YZn|oM#SSA~A7ES(RFEY7`pKJ04KEBBU zT&E^~<5HXK!)-J<>^0x!bKDAylMQ%dHt*q8VBFlo|4U->H5Y-+2Q;D>Cr4f3+8m}O z#k%>B{yyf-myG3@CqMI&nw(%Hu-V7li*@n|JFU&1Y`mDjj2ZURgn$f<%^g7zOp`z8 z3rt?;CotK@J8ANtaF@wvLMLp#5T?a8IW1OdvOp}?m>dwMG}+Hx zX7YwGw#{$iH1am9y;fnI{3K6ka=;6l%?r+*VgZY6UU8*?WwP39rOhcfTUa4N8V~j` dL0CFZPC;3AFV28i5>Q=jAD%I7Zu{KD3;;3^eFXpj delta 1715 zcmb_cT}YEr7=E|8()m*?{K*KH;cPgaZsL+M)VVOzP3OIpk8{p<-k<0FJ@5RwF8W#b zcuUJ#voX_6Ei_8~6r>s|QzLmb{1JR9;Iz$n&~pi;IRR0Qw+g z+i8+U@C7JLmvNiGKCGgWQ*7w&rRXKt7*|}`$JbNC4inYE?0Kj~Anb!tFS(#TiQ73y zhPK`CZMj74MH!3Gmhs6We7LOk&~*a zk~0m}r7FU<4Y(da7(sX!p++D`9f=kOEyT}zvU&Y&mgq2;H2idR7tb2ZItO)gAbqr? z8E#KOEKJQ%9Ko8P2J9EHBH)D;({?H&yLg#iq>%-<<^p3FR@mWw%t${=sS3L( z#*K4SpF3dcQY@ZwMM}l;{e~q`%E<~OhjOZtHabC>WS}(m?oW&5)F8fOY~|TZ)Cm`4 zM}*;+OkogxFoZpVrPf@HO#$KQpHAwA;$dbva_V?1qMo zj{0P?C)ylS`s6akuc~e0>(M6dKd22HyKPKTZQNrMW>1$kS2kgg#?YJtXgZnmI&zZ_ zkJ2_*bC+w|<~Z7zQy|BMd@E`%#+$wm<3NszLSE}G;*U#NO7@~%ts>vIsduTuUc3~E z8%Ec~CK6g!wtr&28&dL(DJ{<5{1*Q1&)*%Ra(4IOWUIk-H&5~OnFf?ORR-hwOEB=P z9%1#-g+IdebEhx?4ioUOc6KWt@6IoKjq_5P=noMtBzU^a=TP@E;~-RdQgZ zSXf`r>T?qzJ1}4r>^G}Vv;~PI?3e~s_?&Ucg|(%fB%LTi6;`>5d1qr;o6u?%RVosE g>yeSqE*=-_@9yt}`OEsuhdn6?!;hI;_%xvX2^g+`Qvd(} diff --git a/PROMS/Formats/fmtall/CPBCK2NHCall.xml b/PROMS/Formats/fmtall/CPBCK2NHCall.xml index 56f425808bafd1a0b7f05f99f22ed181dc5b86e4..f52712fc2ef8b21a9e9035869566d05e6798b223 100644 GIT binary patch delta 177 zcmV;i08an7lmeEB0fN0h53~ypv#5OtY|R fFa(oKZyJ+sZ_1OBFC>%nYap}2aAp*K}tV$C0cx|tIa3gmN}+uZhL`(X=$T~yF* z9SORT=%R}th`yWtgy^pSz{1NQx{v5N@AnOryfDVzz3+L?^PcBC=bXKK=Ki$l{_v&6 zH%TeVQH3VRz-o|AlQc*7U`?|t*}l{1A;%kJaL9Ywn8Ri8Wls z5LDK$HUht!z-A!A zyhOY(R0{l7;I{*Lx diff --git a/PROMS/Formats/fmtall/CPBCK2all.xml b/PROMS/Formats/fmtall/CPBCK2all.xml index 927f93aa6e1de4a0d70660113805d095e2dc1808..41fb44e35487b7d57ac3613b13af237513ca2feb 100644 GIT binary patch delta 176 zcmZ2Cg{h~5X~Qn|$#2+=HV1G-2u)t5FECj{x?=JibDqiTe7GjBXyKczr@=9Kl{L?1 z1sNum$#x1Vlcy<|Oy*H6oBT&HZ}K~(H=DPpJmH?~VWqXn@D9i37P}RUlh@f8O^$HT zn=E3hw>iM(8zWHkoXTVaXRpoglBY0DF0kJ-IUvMm@`5av&1xA^j4*-C3$hGYCfnpo cO^(YyHMvP&W%843h0U7^azr+}w7y~i0GbL$jsO4v delta 1216 zcmb7E&rcIk5FSbegBn4ECXjWvpd>`GfPe@g1j`Q-YKydq9E@b4r54(S&=&E6!Nf!p zLkvSac;pW-CVMfS^glquKVagKpgrkLzj?bGAacMoeSL4#-hZrY z9HAs-s6fMHVl~O25xPr@u%@^)Q^y}FyMhKqVJT3G@|3`C6kj=8o|R*UX8*2?T$m2S zWC<8+9&3`q^ax=sO5=1JyJZ@nCWKk0A}mdK@L!KS#ej%_m_-XJN&@RD6?l9+$cctk zmy!jt4t*w9q8J zE8q%_D8J4-a~1aW;P*3J@KtMGy`2dd`}+CyST(O*t>T@Y;myHb`)k|i z=@TGJdceNa)8ap|>voyF*Wc32##Fr~^C1Kron$Y%%%Vyd1g_~1Z4UO?52m+#;@y0_ zcMiTXGSXkB{l$F#Kh6tf_I7HoJnRsNK|T?587(4{c~GR|@4bR6KYp2M<&8|kxue!U z={DY9nc*GNkR-y#C*h{78bW4&7SnuGl=~PA87=%1*o*V_#b68_oK#Z~h0z(-4)l}^ NEGCS4Z0+d}|6eM468!)G diff --git a/PROMS/Formats/fmtall/CPBCKNHC_00all.xml b/PROMS/Formats/fmtall/CPBCKNHC_00all.xml index a600eed94491f59452761d7dbb143e4bc6ff0934..daa3a4ef215c69b8d51d76e252d28b9d710a373b 100644 GIT binary patch delta 49 zcmV-10M7q_w*iK<0k9APldcpRli(QyvyuW56SL+OASaV@JsOi7JqnYaJ;1Z1KHwL# Ho>t-n$h{LU delta 311 zcmZqM!q~8#af1Mpv@1gjLncEBg9}3dz1kG%^LKAcG+oXk;!>qa#qO2T(K} zC>8(|D*}q;F_cUe3>Dt&AgZ9w>I^h1XL6>Ev@)0lG^7luqzDK>Mx_E>1#zb>gA#+m z`>9kl{TlHL9PNB3(*f^gVZK7R06Hb1F{qtoPexkhHNwy;Xo&WLLikv fX|tp4V{uV`h8&<}AdmV11^5*tCX diff --git a/PROMS/Formats/fmtall/CPBCKNHC_01all.xml b/PROMS/Formats/fmtall/CPBCKNHC_01all.xml index 386ce9fe79be221080dbc18ba5c8a28c9d81b120..d9e89796377c61bac1cfebb307062971abb3f76a 100644 GIT binary patch delta 45 zcmV+|0Mh^NumSX~0k8@JlRN?tlNv(~vy1`~6SLqIkSCMeJsOk#J=U`tKU5U6h*RbS Dl)Vx7 delta 329 zcmeyemhs&N#tmFdlCBIX44Dii3@!|bKr)d*fx(r*mm!}aWpcfw_+$lSKOnz^ zA(f$+Aq2>B17Z+A4<hc05l}2|a$=C^W-HMN>dwwUlX8F>%Yec~KnT*F%3#Z #o#3JlogVJ-)&n|#zp zbMh%0DR!vnHVg2?2u(J#7npoOu3~bG8{gyu@(Pn>0=XtLDFjS@qad;Q zmcl&7$y1b6CT~)an9QOqGdW4wW^$2=#pYWo28^4#)U^0F+gZ0TZq6}Z#0+Hh@NNF* zxrA|YR;a+_1CchHrF`5NH~0AVFiwuSFECjlNNRGPe+QiH6Hv4HPrxyRq(tx}sMdhV ze0~Cx-9mnB&I(-vGY>4dc~kf%R-mW^;ye#NPZNH;iR+N3hD|ganPr7y6SXZzz|Ttl%uS r`AM-#@aAV{R2VnAooHbJvR*MmxB{2HF+o@X*It1nfJ!Rv>|+K1WFv|> delta 1632 zcmbVMNla5w6ulLQ3JMB=3J7g+0W}N-fuhEQf@PAnAP|hk=r1jUVkxCgi7_#53@gJm zx-ik0=u#y7IIIXPB(f02abpM=S0*kW{itj+w%0F5P)E8+T znVv=(1W14e5Zp!Q=^P$~LUb8lVf+qjuvAG!C>0;wAmj8=HN5)4$a#eqPMGN^G8NGB z0DTxp-FSnrwc@)GL;}Eff#86k4Q~k5{j!Q6A3$4LqY8N?3sK1rgfV_&&F97XR8D=D zp0O^2Xf()6*Ry!0@c6zSAp2$W!C18+po$tUykmG2*|h_>PI!FW>B`Ct!5T#G3Uu(3 z15ptkTxqhZHq$+W(E(y-(4HHuiAIKH12$eTTPwPebP0gn@{ELdTJ(7Ug(akDTQpon zHDu=>=KWMZM$O;j^?`tUBpt$9i0KSbJ=__k8ie(#|Osj z4M(o(5T6|RoETuzbt^uQ9nC#lKbXU(Thn>k{X5>LKJYx%@r(~v=R2oU{)x62)SJg{ z=<2FlkN-(76S``*#Vzl&7o!uBYam3?k!pwS0^VUPgHhFcYQ?~%dvglJt`L)^9iaFx z6z{|3#eDHxRRzzM*YTIKCiSiIO{VNgoFev!*eYV+6(o9is>I73#hE;N%E!z7hbR1> zM8*F}SC{)&l2Rl^o@>e9qmlK8UJi`x z;uYr>L8vitKM@J!)Qa8Lhs&lHsTUVjtY&O6_5Ru7u51r(rB5y)H;fmhl6G}&=5dNK zk!v4S!D%(96EEjCC5))0YAxc*!mmx1L>QH1!{w+G%Y|yS*xRqaCvQjv)gHc|N%{-h CfuI-w diff --git a/PROMS/Formats/fmtall/CPBCK_00all.xml b/PROMS/Formats/fmtall/CPBCK_00all.xml index 9cda4a6c90a92026f465eac5585a9a7cba71ca0a..bb7bcd6763f79e407147de35b799a9de3c797515 100644 GIT binary patch delta 48 zcmV-00MGyUwgLXL0iXhto)j9B&=~}?f&vl~v(^yM4`Sd2jIg%L zM7zCP`)mE{|Nn>7?q}`f2vsn_96OXT;yZ$Y3L03GTH=}0#Y6K(4Kzu1u&_mss>-YW z_K%8mF(Shbzc1CHwS@sACp65^W#o#51(w!Gr(|ui4Vf)GRb6IuBjGABX(@(gDE?NA z*we7#Q9%}G`b?Qe3>i^3lcH?~-Cru^=B1=&QlX!ErImM#Bb(V&28vW;EdCq=4y5+C a5R=*bEugosWHYs9lko74$;v?g>U;q-Swn3A diff --git a/PROMS/Formats/fmtall/CPBCK_01all.xml b/PROMS/Formats/fmtall/CPBCK_01all.xml index d42d1ef957a3cf5192dda9761cd50ec808f66fca..93fca284f0cbc5bc96bb213262aef8386df8b2ee 100644 GIT binary patch delta 45 zcmV+|0Mh@auK}#A0kHZ3lPm%dlNuuovw8v)6SL42kSCMOJsOklJ<7BGKCTn9#!}z} DpB@uR delta 329 zcmZ3phH=??#tpw1C0!X(7%~}37+e?0z#1XR0dlHB?bc^R$#y`4|6$K-Q=w{ znv-|gNU=jjCttQX?F@1$$SR0_5F4a6nV}NsggmgxPC!;NLpGXt9y07%a= z;hD^*5U}~2!Zyaq3zSqQ?^BVOETAkiIZxSUa-E9B=4UDfjGL#aY4LCNvTkAATw%V5 z8OZA4+sx&)gmLpN?@5fCXZZFoPW~07HMz>a158H*)NJMmJO&cnGx?Uc&*Tk8B9qsJ z3rr3Q`2pk$Y>MDuoZJ^S1tzz7UHBnZhy)ko=529pjGJ>3Ua?Ge$P$?RL6>84f}zLe zFR2e0fsDS*4rzRhlMiKH+x#I*i3v#f0CnWeVV>;at1|gj(SgYcl}ek1O5}n!i(FJ; l+?;o!g$2x-yg-g+v)Q>rOhBF#%jS@)d~6UE3-0V=1^|p^f9C)I delta 1615 zcmb7ET}YE*6n;OK_M@e4EGx@xT9MLpnzCTTsbh-Ma^wkYRl#ZYF) zbrYJ-WK^H;KdB07zT0wlgAK!P*bDsA(=Y7vPan899i{sr5`$|zNs;xNgH)HkU394+};Pb!}rmq`KMKM@=kaH0E zM}!+FwZAO1+|!EOkkW~Syhw(ncPq&bdSNZE@&n!vD!&rT<r8Ek2*bA{ZQJ#*cEIL?lo;5eH2kcHYHiD@!fBkn4&InzUJDg`a9yGawkX*e zOq_atvP_9`lh$aVMGbj>@fGJM%j^R$^AuW4)M;BWIdN?C(>hz8v#rr`O~T1CV5X7EHMC;a zTshWIp{1eUu0NkcnjpyP1mx2cOvR+R;oy84*Zy8=eq0t;#FPUj;jw=s%XT1NEU2{;E(OEIixIe z2u~B9E!+e_IUI6l{Rg;9la(D84B1KreW*5*wK1nm*VLk<$DoY6C^9iFSf_&qJY|gK zx=c^KSq`!U>|{OMP6u|+B1c6@eP-E-Ow|SEK^H=wrPrbjJ<8(=BTHWHs&6&7pdrI* z+)=iGPiKP)$A-0c82ngRuOL4zeI(q05Vq#y$| zLdz(x^628UfFC46G$_LnX%=TJnl5QOsTo`%B=A@}DP(+0ccOXX>J;|2|;$x%$xHY+hFF;BiD%(ZwK8{_0X?DHm#Ji_|wT0{}#{EUN$j delta 658 zcma)3PfG$p9R0aQRv;8&LSe33NkY+Lkri}M+lav3NWqI8M3?@XsF)r)b_+aAhfW>p z)S)Q$(6K{)0s9(V`Udr8M-PQWEHli$_vXE~`+NU#TwO>{Gt#(51v;QAty2zrj%3m( zNvA+f*52~6kaQiCNe5CTlPZ+PX#&_QL(qRWp;M%dxsqD?QJ1?{u^eZ53pHgr*L5moAYy#Z_whgQd ztVmV%T=7`)fFxhjmj5IRm};2t{ax7AQ(f XP|o%JLj=3wM%>vmP8D&r^Q`m@*jmz` a`ZG)r*1qO_P}ZLIYakXI%jQdcP0RqyrZ<8B delta 812 zcmaKqOG_JZ6veL-5;QSjHDkacje>Rg&NU_2nr@~d^-kTwIDulq2NZn z;Le5Eg>FO{m(ow*MsOkS?9wlx=gydd8e|AFIp^@Z=gxo550%?L%K5#WlO=_DZPZD# zG(sA0cvZf$A5{CO3(5j%G*59nwc{uM_5W%Ml|xO?G!mLI<(ReEC79-;fg--o+x^rD zbD4SoijjnatT~Up5saC9QKQIDn_hrzuAxdR+fNh7EYLXhf-r*$5sdf=bqrcJv^i)x zZ)~bO>>Bj;Ndfp$Wt2LQ)1@}=g^KvfHM#%AvF~)snrqg)UT{+;0~D~OkMygg8fwJd z_u^+ft5qD#WwerHz)V@Ro>w$+h4Rg$1#!hBHAP=d@f84ny*LfV++~RqGW%43_mC1d6|28l3cVXPj6UdUX+3k=D z<7U5YNvsgoyFGRwmL1#TWhYoRA3O7i86y7T;wdHw>(kXU5Z0z!JD`kvUzj$FJ>+45 KC`fpg!~_7ColXk? delta 1113 zcma)4OK1~O6up^bVt@XcCNYFDOf7gAkI@xC`{kuZvj8Q$D`-nr+TI}>lsuNKVO zHxoYWZLW{QF}MJEQ1N4@9al}0{#NLxN*PqR2m^HLrH6lyZB{$MN7XEh5JF|wrEy8- zz#^`kvaxl`Ba^d>7|+3RVoE{}wMKy73E+L}Nu0IrP||dJlqPf$Lmw1i7|ue9Y9*?T z;mUJ6{<2Q(JV9S2nw+NR8gZ!jW5|!&><$b>EG{vU_|J%&!-S2(R%n2Fyb*R{%HGXU zHox#t{1b=Xhz%#Ve8;zb-J-Rx%F&kkJkIuxEe&qG(o z&sJvulEmqm0Xik4Ojae5ahM12Y4u{Li;bjlR_ zU$8h6`_S`G2_lwm5|e}TH6k;_%jc=!V}RT2fFq7Der;n`H)>$TzFyZ{5 zm6luLHaFAb%6aV)yLYrPZ%@+SkQbZnC*~`{Sdh(Vx2%S(5VhJ&EHxLE4f|oy$Clg8 zIQ?b%$+HJ$tmInI@%pJ^I0@RJ1NK2gr(JuqB)N@nAqYSi_E%BwUPw+OR6A7VeX6`S zMnpgt$X?D@B$p9K5JDSsw8c5eV}uFA0SJL@5d&7$B!8zxLb3zo)^qM}Jif?2dhLNblthDmC5(?z#M z5HIMiQ2GN}nJ&6;>&E_tF4UFaN+|9MJ?~8fwV{g#@11+@J?Gy0J{&3EkCkuN3ZM6N zKS;`we7vN=! zSDp@WHsI;3!IOmw4XE23jP!H5*BhEfPixYx1#eTRYX9TCo1b@h_(JoyH#41p@7E)q zjrWDbmc#(u5sSO9R7UG14CTtFJE!BHw4@u((59S@EoW-oa^E_hf}17ym0j|7Y?R-} z2DB#12eF^Y|H{i)E}_XfYJ8IyaQ&HV#v?HK9k<8k z3Z5*WD!w?u$@hHtCOgFOO!kt}*=(S&j~Q8DvVnrxWV_33o9C(QlAGM1!ZLY+y2RuO z-fWxaIP0-ZHuI92{J@iIa+22>nB?XO-j`T5R|MEGZax!e#JJfaSf_Y%*bNoN$y*|X zCigvCu{q|%DHgEE=9F_2SRpKvt8C0b)*lc7RGPL#X!5;RZ#LIFH({K-XQj(zt_PdI aGMgS*K$L8*dBz20oq6?vY4f$W9n1iCB5O?m delta 1194 zcma)5OKTHR6h4!eO^A!O1ko7sP^dwKJeo8vil(tnlqM-A5}`!NV{DS9Nyx(oMNx3! zQn-I0;2)^W&W#IquB;$hK}lS=(2Z_fbfJECZh{sElwoG>oco>ceBV81?(G^sd^B$F zN$zE;P>p(Yj*55|$wSMOq86eGEs~GzyqbNyCrMrpr4j8R+NB&;=W+Az<|N9t&bU;I z@uGRI3YsRZ1Dd5iZQ?3Yhi>Dmhi5|&Q-qC%v#c~VlRz2Tq68&LrfalBak>NY@Zb(ZZ@1Vv4-{gVjSk{;7C&js#;LYnF72H@J;Ndkln>q)LgCt)73Cxin4;O za7yIn;h+M~)qNF{h^`~HitG+|z(y|}>Qh@?Vs)$i^56Xs60#sEYYE)6koa4c*qg*f z`5ee^p*&FRe#*gyvPC^^zdG&qz?%YPeGn?N0zFN<<8&Qhg*w_<4AyLH;4P^?Tn~-^ zo1hN7KDV0>2KOao^EH=QM(6od_|#`-vlg?q$(*wDn1E&I1}}|^ADJ>~i#T|8Q1-JK z`N)Auvrfuy68|Xk$Jp!_lE=~Wc~>Cir~J({oy1afL^~=9s9#nRl1|v4UXUVL%#Q*$ zHJnxrs|woErxNTAo_BzK&(GL8{7RnUsH%epV5_!e7pc-F8g{4 Y#@z4|uJ+8|Pf*eAEKH0q!0ZlY0Eo6tmjD0& delta 1221 zcma)4O-NKx6h1Ta#(^~EuW`s2G>uR!n(=28qi8bA7CMe2$wZP59ko(NrYUO`LIf=e z>_9<85w(aG5?p8%5-lR6#kdhF3Mwd}Fq%a!Bb!P& zQhP9EEp4HGIz}1VM>_sGl~D_|Q3`01c2POUzI%Df`nV<4e&v#c{t6w^pj60@%`Y3V1nc|C%Xljr}Q; zb%$ScI-WRuQp^~2Dtbv*M~zf2+|HdAe*|3|N2r~m)Qp5-*%1Z#fU9S_fp(+!e&`v3 zGMz?HF@pYDfer%e0G0+e%5Ud-skmDp5a@J8u0YNYYWu_W_`A7njI z#RG|wRkO||W}E-2OIfxT3j6598s*&>uYC4+cB1X@9nIN_tughCdiRCB)x6>8@>*OJ z_AaJ;QH;J{jkF!t#+4T#F_EjXh^@0jcGGx`it|(UaCYgYxbfzQO-#R9XE9B#Gsr%_ zp3?%R#i*XbR6}**_HwmF%)ftWHO&hnubyftZ18>fIBoTt@zs(cPdxjSwQe-a2%%b| o!Sd+Kj5$jfdM0u&UB!WX~Q(e$tM`6Oip4J+Pr|NjB#=dFBhv5gDr#7m*5ri5kxN0FPeOpXc8WFW>(?Yr7GJ^IM z%pYjgqFt?men6X6Eu%%}%{YrfVt9`?=bm@Yz2`lg$zSL4eN*C>VP|)OlC(obDsecX z@TJro@KFj#g-WzXS)Asv#DCdBIUMrns(dUdqP$DX*bga2eu~f}`T4Fx@%Si58s$;V zVBdyV9C8U5ty6^?4lmERZ2a1>;Ygxhg+_|fhQ=7jY&Y&Wm>Vs04*FY0ZIs_^D6QD!~7F*cCHXGq_zanBbyE;VLE>#qzak z7H;}xp<3n8v{!$$KLz+y>Gg<&gqbNR&O)L8X0|Fn}sD##uletjUis48iMS~Olb z1<-uJs9xI-N_xHgD!bd&$7#%DTxg%|87f7zM5T diff --git a/PROMS/Formats/fmtall/CPLSSDDall.xml b/PROMS/Formats/fmtall/CPLSSDDall.xml index 53c6b5dfd014f341d433c649944ebc4e3ba5ea4a..0fc020c5848165a18b3370a8af7faba8edc5867a 100644 GIT binary patch delta 272 zcmX@HjCsXu<_&ikCl@fWOcr9=Gl@B3@*d`QlXGObCZAyun!H3@V6zl!8PnuT>~Wim zIHVXib8xK@nOtWjFxeoRYZ52lWCaPH$pWi|CQtB_+w3N<$BavkP1#0evYVRB<_32u z=E)aiJSNwLs7#LXegb1}{^v7`5zdM5U&c7uEl_3hw7>%(ZIc_^*)|^t+Q2foE&SBx zu80i(%}fVX7&jZNyu<=wIj#T11YwnI{sk4=u=55~?95&ipABdK delta 1259 zcmb7DT}V@57=E`iCq=A?X5^gb_=Dv|NXL>E2Z_q8ZEf-%m{ci#7TpZ9rxzSYOt`xWi^ zj*UHvpF9$#DCH?bCL1~DW}j?tn+%Gmh;!7v4a7{wtaPcxFH z15^gUIe4S8z!FG=^kHC164OaRw%|;&CFcq6-zg$UFo6Pw5m6LU+3vENe|6T|Sf%Ee z=w+Wulz_6dgot{S5K)6lu6$Ly5|{*C1?qPPb^f#V*(u$CauXWMATntPnR9rDXk3n^ zD9U6{#*VT=t&49pOlkiUz_uEae8XsM)x}^%B}%q93z=!UjS6#U_vaR!?+?~%>|R^l z0pNZ#R!)<>XuH6T$R*pM!G){)hXykva)WPQTd~zht!y#sX;G@;03_+`;Av$_as z+N>09Z%RpzSiJ+V>|t~>Y~71L<;lINF7ChmN`YCdw)wkbmDq;kcm$tnUFL)ob~f>$ zD}kLg(cUb^n8hiBJt@-|)=mT$@Q$PHGibjULlPyG$>e*9*|<9nb4Fg07@+D(T;wBb z?KZyjblY*-%HK(TAUxL2AO%$TgY_SdGgjd~@>93MtiSwd_gGhyVZp delta 726 zcmaJ|36umPhT4>=G0}hh7ffgZV5+}GJaYGS}sE|S|LNd6U7=sI1=pO_wh@GH* zfG}TRV_|J&Wu*vKmLlkR?-@Z2GR*Mi+;h)4_s-nBX-CKU)um>PQkqsMPa~AXGf93L zr76k)wK){_@VR!@|7Pb>WRcarFxwhR?dJ zb@8)nF`&2!jFN`q@(+h`pi97Jpqdkz_`2W2WA4I2US_c=g`U5QP#$y8O36MkjmjYA z>5>zvS`k+%=Hao&eZ4;C&VAd#h4uzRY)n`yNpThuDcYwbhx{I{j#lwQ`>A6E-^<;S z#C?|0s_1drL2C||n9lxADpPR4>SWVutSIhr(s~;H#||@yFENB&q-gC|paixgeg>Ob zoM80Y^u)2`wEX7N0C#2TsPnPasX6s)_qw-KJxr!z)Mj2wGc1aLp}Bme+PksYFoh^e WmXc}PebJ3l%m|o0MONgXR{sRir=QpW diff --git a/PROMS/Formats/fmtall/CPLSall.xml b/PROMS/Formats/fmtall/CPLSall.xml index 23268ada45adc8bbe87c8bf95f1d1e941cb3b56d..f2cdd5d6bac7f96b97c9ab7a641e34aeaf77989c 100644 GIT binary patch delta 247 zcmdn=jrr0W<_%qpi}x@xZhprU!7{l?Rb=u$_FI$h$a78J#UV8Lk22q610}Y}Je=Pq zyKqHp=HQlM+&quRPH?iHC*R}+;XIS?nd)o~kjrC67ML6$XSO**DL{5|fD+4O0ab}f z9&DTc*z2)Pp5`Vs*};u#@*%f7Fu6@0mslph@Yw^zYLg%M_HAC_7t*v@>>^N$*hLk_ z&2w&8u|im4_dhT}SZ85?#7PE5AM5cUhwrB K6q|-gs|&jj+B8N*q9kKuTGAw%K&jA5nv6|sOk>hCiilQs zT`2U43s-`FK%I@tg8Nznby1Km1S=@0DP$?0H?JcV29%KGzI)F*_ndcc^PBX#ExlZ_ zut<-4-!P5Q9OX%+5cRRFv-8E0#nS7e1hVtU)+mE0iZ4HxjV#+d>(!oG<2L5l-hWA< z0%cL0!G#E-Dkq~mq)?15(pBWbbeVkApdv^Lh&U=ov!Ji&k%}B|Gz*3@-DMvg+jf4g zuvZT|*_yM*>!We-W`R%R_Xcob+#ZH>aI!_e%%01(Wmh{CM(R4+B`662b5zpB3_y?% z@G`1ny002&xZo5pH61fVLH5%%$=a@i-rY@NXfXrXDcq=Xfvk6_2PK8*0NeC1*BQH#3Kzs`xLm^o!beuaR z``}K6k2;9dKfS}y!6#PLA7kxGhqmH*CjBp%t$3!j4|2*Y^I3D3LN1TFyd2$zt1@<^ z(I;z>P{3i=0qmaQIVzw@THx*RDMFlT%tkyvyQ%cE1*O|*Ozg3;rTnASu08o%%s7U@ zH%Z-*vwWdxI}pQB%xRvtWRoLrO>!q#bo9~5G}cIkry}00h$xSt)M*-fz)36kPr_>n zp1Jo7EY&g1ccT*z4kwY$>${o&w4nnAwfC)lixyu!W;d<-^*Z}J;bv2-Z?viPiml6x zXNUw+Yi<0nnj(S}5WO6mU#v&WI0ng2rv=9Ssb%$;V+MfQVLHAQlT1;5>}0^;dh)ef b@|tl$Go7NKfop!ZnX?7Jc7}pbwkZ7uN@)>| diff --git a/PROMS/Formats/fmtall/CPL_00all.xml b/PROMS/Formats/fmtall/CPL_00all.xml index a260a028d07c86cb200d76b15441157df95547aa..1f20da7eba8d5af6ba439bfe65210ce8c8048750 100644 GIT binary patch delta 162 zcmX>yiTOe&^M*H!ljWFP{yG{@w1TwIg?aVl)S!8Jp7@*NAQ$^R@a zY!fJo_#D=Lz z^Hiogl*cKIMKwg|!;KR1?v`t=nU0R4Nsg;@W&f*p>IgYXeXHbD%!;Uzy*F8tUp(VOAhJ+{Kv`W zy{m?C7ugo%jTTNvk=Z_R{~%YQ{?KV%cr~CqZ-VbTd_yRp#0fKUN$!yHshq-=^INFX zEf{4|l3UGoZZn$$$0!e&zlKDWq6=3q_JUhL19{XN$1k~!U4b5*Voak)@#`##JE0y! zM}Ry=n1X>2iW0?0!c1Vxl6d9j%uM4Lx-H7CvH+h+N~iPod%K5^`s(@b*FIjEtmV?i zWv6ZJx~}A>B;R@dVN-pccF*s9s^}5beHltqFC`^w`}1$jP?1dP#?wWnOZ&2;HK}M_ zVU<@WrKlIzo%QnWxBZxkk_M%lGKeqCBI@~4loS)n V;7)btkEU!P4ORx@ZSBRp{{V(>*UkU{ diff --git a/PROMS/Formats/fmtall/CPL_01all.xml b/PROMS/Formats/fmtall/CPL_01all.xml index dfc8520e2efd7369248082e193b3cf99f9ff4e33..ec953701f457435ce81e8af929a6a60b872e9dc1 100644 GIT binary patch delta 157 zcmcaKiTPe9^M-eflNFeZCSO~^w|NrNEY`_+9MdMh<22fQi))7NXrseQi&biCEGXuJ!>r(HrIxkW2SX1J22P<&Jo*0+A z@k0sK@;Y6Yg34ubr_qkXh$Ai^q6Nit9uEflkCN^6E?JCaI%=#fv8F=bB0SmX>s9@d z=Q-DE(9I<=!+E`Zy^HM@9garAs)YX__GCCZ#bH*&b`nFuiDTUg2KR!MT_zZ2%KVU# zAtycfFN_0NnRLEPsZ3QUp{qJ8hYF)8Gv^e)%^995xVn#+XQ1jEx=8sQCz2M&Ds!JX z8mK~*rrJ-LDeYzercb&H-35kR4Pu+6csoFB-+rDp{LRO8OM9OU@9#Z5;6BIux6y>o zI*%O2kO>Wry!d7&b(Diq{zl-mxK~ZHN5_qzHOlYTpY?O5>@F%~jA zjW=e$j>(Z3MV^zl+;$q@4QakVC5x3lvEDVbyJnG5+qU{Qf0$Y-M=HO!>CcaUjKAab B*DU}5 diff --git a/PROMS/Formats/fmtall/CPL_02all.xml b/PROMS/Formats/fmtall/CPL_02all.xml index bfaceb42da2981d46440cc1f4e90e83d1b96c552..2ce46c39fec9c3fd3c796e7f90b8f019579c33c3 100644 GIT binary patch delta 148 zcmaDbiTO<@^M((Mla-i^Hn%aYV4YmRF>Ue(PNU6txMt{1eqbRrxyyoUGLPl4%@S5p zESn?j@*+1s+o{61nPuh%76|LpJQ(Z2k_k|;EvxP@L1eG3+XrP`*>noZy0`5Wh;@f~ U^RvBTP#q43pD}HAJ0`^p0GV$_$p8QV delta 932 zcmZuvO-vI(82xs)x@#4~kF^0Qlp0OY5TPt9RcI_L1`h&?k$7y{m8ul#iV|;Ly^(&A zn0PRpG%-=)Ms5;fJaOahK`tIlL*&BI@Mg9gB$Lf-X5RO{H}8A9wO7WksIJQt$8ZMFm{{lk%-J0MQb zG~|jXmuL!dWwhncI0keE*d#C?*c@wbW4viD^R;NC=^hXtJyTdOXqG(g$`12RmldC< z3N##l~%RFIBlFz%RV%*qaC2qn| zS>EG8c??edL$@wnr=JSxCVy|-#wLDhQGFIJM&^@ETl zkIy;Xe8Fim>nOXT$u^bw}(@##F_i%Vm+%LXfRFyG$yJ#8PFLEq>A diff --git a/PROMS/Formats/fmtall/CPL_03all.xml b/PROMS/Formats/fmtall/CPL_03all.xml index dca4a687b5d6e6c084b3d06b387ed5d931da7957..ed9f766003ed0f4f22bc70305dd809736f777f63 100644 GIT binary patch delta 101 zcmdnDhOuceSJdD#zpoZm!7{Tnd|4akofJ-k{*I`H~8o z5Qs5(fvdpee}NpEr=brn{uBH1M>GnnFb;;QYr*{pQ0hW&Ugep{GDIOO)ej!>z-3^;t#<^K)B@emD&0aaf z+JxK@wyk|R#mb0}UtGg+6Kox<0xJJ(SVi>;_I2zFU&2`e{ZR%siVxXNA>qk3K(J@QHsj*SQTjJTdz4>266XF6tdQ*)6IYF&bpd=ZR%7}yN2P5 mw5p9!So`XON68@0qJ1wkh#cDiM={YUiqbfmj#^<&cf12JjHtB$ diff --git a/PROMS/Formats/fmtall/CPLall.xml b/PROMS/Formats/fmtall/CPLall.xml index a96ee31bcfd9b456c0f320aa99659dab60ff5ffd..590e163a76c5e9daab7bbfaa7b6ef120a51036ef 100644 GIT binary patch delta 246 zcmX>%m*w3AmJP2MC(AIM+3d%Bh< z{J}$R@)2dF%{_6G*f*P`DKSnqNmJQ8A$?l$<}II87&oWf31Nk>zCF@|uqH2CBQ#xs zg>lYifmaDE5Xo)t?=S&bkC-9cYu_(0Z9ekr9hCd&|1FTL3gdP@7RFCdrW*(23n(*( IhcSr>096BR%m4rY delta 1197 zcmah{OK1~O6umR~NvKIfNP;ax)1uIim87*n1jQI@B4RT((MCmNlD6^FHgOuQf)ri4 zDb~9X3ho3~f-q2bLb?)>f~%tFBDj%Kf-Wo+q*-K#pPgf%D6c1H&oAFDHJE|*I|_OrXfMl6!QTQEO{?u#oMZ6$mKL~$H_^Gycgjr zs8rLbHiOby0N;6+eCO#)C#4yB?h?lYcJ5B#F}Ksl#}W4=KSfrt+Itp{_602vX_p@- zTkCkw(~>ql|4v${%g~GhpHA~h6;sa@^F#z@)`hDqX}g2pFLmJk({`NqxNR!vxR_Lw zQ{-%#Yi8M{h)ZvB5V_*UUY|JO8*4X4edTTp_Xibrp)3L+ioG)t1v0NuEH$-gxDRgz z|KDoV)EBOVU`fMm9-~e%Hx>#a+?F+NMkFrmVXg-ka&4|g6`$wcCw5fHnU9m+0^Dfw zF-Din)|}Q1`@{Q;r3;T;-V}X``>*g_Pv-kj)wY}KMlxTW4Wwxa#`)@x(6Kq5PSmJ< z>yeE8YgvaSJ|OUCpAT5$2L-2`m^0`sWkeRqh(q8DqAKO;X+=uIHkP& E3#!E%s{jB1 diff --git a/PROMS/Formats/fmtall/CPSAMGDEVall.xml b/PROMS/Formats/fmtall/CPSAMGDEVall.xml index ea200aaf2e3a2a9e6ada267d81cf2b70371bf624..a785b79a8220f6a256f1ee6b2dc275b2aecf4da4 100644 GIT binary patch delta 145 zcmZ2?mGRR##tmXjlRcPTZT`g+#XOnEjB9ckTiawI_IZ<4I0Po&VfUDv#&Krz zI?f|3ljjMVOl}b5m~5vnw3&lHM-j-Fu{qB058LEp7E+T7EVw2=larV%U@kDZ&b@4M o0G|?2htg&#s{`_zzeIYm00|Yw&28~a%n;UvWEUtaC?kdm04hW^xBvhE delta 703 zcma)4O-lk%6uo|BkrHJZ88v1UNKj%jR%A4q(MG3IFfu7oNlPtkFrz=v{`L>rOE7=H zRhuGc(QjxKM8BZ>-kTPIL=5k7=iKwoIrq(cy_h<0rU#E1W6qI*1SH`cN>Ii^*o~uR zP4YpC5Dm(32^p%kXtDQ(Kv7w9>9^*J#m$-*ut)n9M8OYXSO!0S*l;)r1!z+z1uE}^ z@TTv6Od*?71C7(E8t(;h+@4<)+$>ayqd^7Iq)?{_3WeAv^n|b-!kUCNK*Qaf3tRT* zL5&im2`dt&I9*Ypn!~9+Ni8b`bPhwHNj?PRzi-|?0AeK z7fASw%fyWOHz!L$tNix-_&yZD?vz*0IBV1R>F`YUmMy|HNj31*A?e+PJG+f5VqTt@ z5!x!WC`*$bc0FZC(9S&gNT|vI%*bB5fnr^LivMZ!@AR|!L8L3WRT{g*e}xp8i*Fs# qk8%N%zP>+ak$Uw*5P}t0f(XdOoVWgiL~@?LMADnNkeV5(uIO_ z<)(0V;-cu*g)(~)SAuT35qE+Jf*@{ODtPXD$wopMX6C(n&OP_s``(|Y&en71)iqb% zWe)6}#59&rLm+ICBT_`kAUXLSeUbE8>SilC!K~W`%gRPX@a%9a`{d z;sT>L7`w>WGGh(Ntb6h`cE!6yG$3A~)^$vg*I+Z-z9(nnO?ecJYn$>cx@Tz?Rg=qX zYN`))JcuFnj5O;h-o~t(GPT#}MwwZ|vaV-Z>_EL3R8-x zlNKt5sGXE)Z8hvJWX8M_i8XU|id3<8<5c)-qkmU8wf@mbb;L1@QDiM^{NWoX*@-ob doMrSr{?u7#h$of92wAbNjz(G~dY@c%{sCxCuoD0P diff --git a/PROMS/Formats/fmtall/CWEDEVall.xml b/PROMS/Formats/fmtall/CWEDEVall.xml index e1b7e6788d38a5b6fa09191bf2fd189abe945986..6027974ef702da9c815520c9fb3c2d81e58b8f7b 100644 GIT binary patch delta 94 zcmbQWhp}xNWx|kY&OQ03;IpZJ%DTy0Kb!FZh(&|wQ!DHu)z zT>~};tO~5ct5%3#{m*=)Hp@@)rP@?lpuEF^N0m5<^AKsI{L5ODn diff --git a/PROMS/Formats/fmtall/CWER_00all.xml b/PROMS/Formats/fmtall/CWER_00all.xml index 98de1dcf115b57600149df6174bfc59ce6388d90..5e807c2446aac9db77bbe20391b7ef64abed97cf 100644 GIT binary patch delta 74 zcmbR9ma*+6zCP!)WZEj%VW7>RyrG;_x2DT|?lQ-B(O^&kVntaFh%;tA? a8XB7o(goOngbL&4hP)Fj5Y~he9wq=qnH&xP delta 470 zcmZut%Syvg6r8lFZd61FMWq<(#v*EK8+DN&wpIkOu~z6p5JD55F=8zhH!fYc5ahb_ z8$`%Y_y>N2pno9Z+(cYx2{)WOcjla#bMvM=ekjjh%4iiXj?lp>9R3~XsA3amaK&;a zEk2czf{q&R9eB9F4y!dDc@KV33t6HLd@?*_!@)!*F|$pXjV7DBBp;$d!YQ9uNLnX) zKx~Uxn^++1wkB@9p>Rp#D+OO8B1++IjhZ2dh!@FjxObSVVOBmHplvZP_b*iR%BG^FV@Ria$C5f?|_w# zGOHF&{xF)%CYLIgF=tIrX*Qj^(e`QtFQYbvuzsFX!t4EaHQnpIh^W;Z!B8Y`=TD=jC2nUg@5x|eAQ>a&At*-PE!}hDlaN1V@`^_j7*Q}(L?HX zF%=8sR&}zFNL%Pr6!55Q-rxx(FG;If%>AVPhb!&so2AyE0wk`gRt^rXI8~38ffZH` zPJS^uoLsHkLq0NVyVIE#=W*lBHVIzFHuKTVc~L}n`ycwmuzne(gz@aZ=-FWm6ARqM L5;syI(;WE*TgPf# diff --git a/PROMS/Formats/fmtall/CWERall.xml b/PROMS/Formats/fmtall/CWERall.xml index d87c057913818b47f92aceebf6dd02e42ca881f7..804341933c641443a8d9e76e7969acebfc72880e 100644 GIT binary patch delta 201 zcmZ3rin(ne^9C-a$u>+!CL1w#O@77Pvv~o_CZK>B*X9y-9>&cFIF2z+KEahRIg8tF z^8@Y##?5f_A_AC|% gYulbQC@bO6DJFscsHP2(O z$=}dI?-nH0Z$ok^4z_Ch*zv~9xeBZ>B_rxZE{?4;F4eRTIyER(~Cam|BjvCw}yG!+QZS|2Hr0C z*g3YFlMB^irDe(7>r-!Is}g9OUscxf2djZ!o*5EL{yWBh0Hea&b~&EjG5P07A~nECx9T4e+V^1poj5 diff --git a/PROMS/Formats/fmtall/CWE_00all.xml b/PROMS/Formats/fmtall/CWE_00all.xml index bca6a430181413d4d8f7181de9c53ff2901f8f07..83325fc820fd6295abfd49ecc859e104057a1ed6 100644 GIT binary patch delta 77 zcmZ4Sn{m>2#tml}C;wvc=CJ_@6~@gMO4L{(EW7F~CIG0Y9OM81 delta 498 zcmZ`#u}Z^G6g>|c+#H19(808V*gL}zd z#6J*R9K_MdK|#+;pn_H&dEA_P&UyEq>vwVcA?_YTv4sG~NU#Zyw+9O??Ba~5RNlI& z?!|P?LYqheiE|vV+Ty4GqY=7+GEom984~66QIrac`;@up(mo)$hYks+Y}+Jl6Fnlf zM{GbWQa61w{WKzBCx}Uv@G1H`U6XHy?04ALLP}{E-~@Vx2I^Q+-l3`DsY2SDyjn9d zfqJuxbGg*T1w{iMJ(nCkq2*QeY*$J@6aT|i!g+1#5cB}KtFE^3ngr z=yGcvxQ^+?kqf5FeS$34Ho;+LQ%k>w6_Li_jxjT?Uq>}(JPqcJ*>Q{&EHjH$Cek2N GO?(3|aBf-v diff --git a/PROMS/Formats/fmtall/CWE_01all.xml b/PROMS/Formats/fmtall/CWE_01all.xml index 811f09d1c7fecc9c00a4bbf40e71a2a9784de3f3..6f9cf99a99bfc0fdc2bd15884fa96ad8de6783bc 100644 GIT binary patch delta 70 zcmbR6m+{vR#toMkC$lgKOrFKVw>gAKjAip0HV?+l0UUeGCxms(>*af~0$E;c5UyHH783x_R2rWE delta 440 zcmezMgK@%N#toMkCp$R`@wzhjGUPL)Fr+frGAK>n�`Zz~BcIDFKQUGlT$HZa@s; z=fOlLSF*`&e#a=mGI<%RfP64RB10}vu_I8q2SX-9Izt9S08p$5D3-@iGC43uakB`U z731VHEIc3^m7Rg+7cD6>JRi!3OKC%fP&>|t2KIQd7uz+{D_fX#l!eM*zx`7N4UP%N~0OV}+&I43Rgk?7)PieDSp$zL}z6zDiHDxu7oB1k~d^ZPORAJnlckCDogjICr0Ep!S^nF*4#%ra>|Z0qMHVs2x)%}!IOS=Q7nf}8woD)JQx4w{P2gN497Zv%{7I@q@;sta>LbfH<5f{5 z50@^?A|y}3CPSH+I^3r_W`;5R6jNCxBV-iegS+)eV42UVUTZ=hkv>1lBkp zgka6lBp^%zREo}HFS06#2!MB*XRS8==y33iHCQY3P`04QsSmM&vZTaMto8~~O;Aq& zizLm9RaG1;sr0xvk;EiM5m&4;fSjPu8`j4bq4O|T+_I_DB@TnrO&0+o1t?=ERY2$k z3cl#}R-O%!T{!B(ghRRd)&454CQx387fq$ubo zWMh#Mg#_SjklI<%t`Ug=&~<*VxH!D0T-~*Iyt-CMAygH5i>l)0ZtK6%VCV7XQ|i2T zpQ+w0ZCy+Ez$*|Bx$a-ynEEQ~w^a0?zII^>T0hla!w(HQ z=6m_ZfIWofCFP$<5OEVSqD75=@*32y3rl9*^ET~#Wof}&qZ>~xbew#e*R$n=CS9*q z^5JWhUURFx`c6K)nO17oQYmXcjV`@{J~{!vHjHL?-q1%aj=;*ie#oTDYU})ifg8TG F{{aYW^jy`O_obn^nCS8S7e47nz+kt~^PCN*#J2Pw75 z9@0jWm&xc%ejzP1xkScnbDeArE|`I)}JWCtsW%{FmO zER)%iRVIfeADAp)#WI;gUv6_5Bz)uW4`-)56avwz{Ge0#uj5^^kV^=vmIzo2rEb<8_RYR I5yoxI0QVqIJ^%m! delta 1276 zcmah|O-oc^6h8OPhhQ=3jMrvHOf$^H!g2gwSm>lk>6p!!PK#=s54FZ|7&Ubh)*p~K zi)hoA5G@jg3yCc(*G1x@7A=BWNQxo3DI&1vy>~`R2I4O6`<{>IoaZ^`U4LTSoHs7y z$!smR*0)k8jZl~()I=rtis=F+VHu_bjZqs;N%ByT#&H|MElz%#q6E*h6!C&=X1n~h zvY5Q^i~(a5-VrTJ+~a#zf!zj_7$PF-XL-q@G~*IOzy$e_7(#d}g?UC+{_zOVMA{?u z@vc)*7jievil~#IiyDAHub~Di;d}Pmxt*vp36Gb$G)``|Ic5PGrt2xI2U#)U<9Wxa zigD@(=O7J$UmX85&t6ytansRV)JS#w-qFY}965zP#0{ghX7Fi8o`@6}N!a4NvR%M= z&IUem&5ZwXgPZzzt=4wT5C2q3p&^ZaJ91(aMW<1{2VSjJxWie;R_6&rwVubzU(I}S zE87I!DZ=%hqAYEbX!V(eU;WVbr6%6^VY*TMJrzKvt z9~3Llq|4#M970Hn2nrx37A#VK7xb6$(||K8RZH#m7^G5t zc_LUJA-7m0fj11w16qwSoJ!R0vpovud-Bt{d_U0oHx|DN6!M4M9DePxv!&C*(^eyU zTdn+{BTqej`J55SPRYf&o`M5us$#Sc1Eu^ZP`n5G_{tkk=8i%bN)VjI^0(j=q8s~q z?uD#E!U*~ux_aJps2xXr>e_y&bKx`6ek0F?D>x_myjDD)1je4!s`xaVgr-Gmj9TSp ztl_Aplz3_pUX3b_9^{3QB`OQ;_Tts0X!RYX3$li_eexn;LJO(lm7OxxvhmV%IFq}M zYSfjTa!K9V{wO;#MO2ZS8W3YM7G!q25Rd}-`QwwEG0Kg#!HZPaetkD&Y}2iGvA*jy lX7twx8nc!SY4MUt^8de;#dq1#7da!8OOTNkmo3sW`48+1F&_W` diff --git a/PROMS/Formats/fmtall/ComPeakFlexall.xml b/PROMS/Formats/fmtall/ComPeakFlexall.xml index 1a1345060d7f0f3483137bd6ef3ea67db5ce7cee..aa9cb01a5e3023a83d3810ab650a4485d31676d8 100644 GIT binary patch delta 237 zcmeDA#{B06^9CNK$yH2OCQsQavUv)#AJ=9xz5v$AGG<(pR|wZkwi1~)`HP6!WFJwZ z$p=L3CRd1=O>Pn|*<2-2qP|(ifsJvqm*Ww!$rce7lOL%VOrGE_HaWmaVzPp}$YzDe z7M96O;&PMs#j;JdiMudaOkHVnN&G*S%^fLrjFUT3R3@cu*({armpR$&v(n}z7yhws zHv6o?I619YVza@WM~ssN+B_z!+}Z>d-7Im3g&D$1c<_S>!kY8s5tNniAdYdf)GIya V$sn^@-cACUrN9DFHswbJ697vgVT=F( delta 1308 zcmZuwT}V@L6hE8SNv5US?o7q9nNAU9TV_f#n>I0Mezb`hl-}mF)jlpdaZ-fzCJ2V- zr3a}8d$+pLTfGKJi-aOb2_&$WiX?gnk_|{*A_Y(phGOsmM zLJvjKgfU6c6t7}-a?i`Ky9gx?llU}PqHLS{@=N_>#wleQLR1=|f&dYTK^ouHiO2N_ zgO&9NCmAM6QxH|!3I}pU)=!2@9ENpif);S%f_1JqNc}Pt>49Ee=0%%rS@ctjo0_+i zs^Tn$E4GIEDY#CvOE69plJwT+9VE{UvQ%_8v_dm}u(jd~TTw-b@)AVQPm_039m`}G z6XZ+c`_*!^+gmXE-9qo0GhVpNQ8Xnehw076nbCBMaY?!fAr522drV^##a8Z_#O8H#hH6artBQt+eTJ}BzE&?fEXrTI?85WDvOKMua@A)uRjcO{r2}F@vr}TA z2^w#l2}Ghw;8YTAuN~<0IrLg|g#-U%VK7{Qg3FB~?GAK{7QA!Ts=Nt55U8jOXNN4T zxKJOH)5dmR6_5N!32zU5?lfi;p#@09hpnT7z9MjIALl_@EL|pB87@>+E14_1!r^W* z)t&R}P*TGI(|#wWhU@Xu$n#U|CzAQHS*H-klDQt*+IV+A9pNNbi~Vp>d?bmb15`Ik z)vP<4ZZBV%llo&~FG)Mf@27_nrg@47`!`(6jaw#VXLVO7F-mEMCZ&I)&ZHb&`)w{Y z%J6^}TGX88k3vqlagLj^G^E+hYbHGRa|yFc7xD4>Gs6lm9TokggnLjhR8flZwKNPPpLPgc&CKuQUOg`tpH~E5;*5*4-MogOzxce|p-sH9o$cSK`+~O@Y zxj=&wLkRR5ogE?#*{+&YU^(_?~^$9(~si+!lTknjA^d zRccU)%KR{4XP0F%;HL~MEh^JC<#9^mmH&F*%3l_}eBQD;ouoTdfV~22j@neiQ=lf@ z!(R*ED(p)XdDc0_pQf$sA9mR#_a@!Iw<9bR zp$in$qr;EQ_BaUc!j+*cB>||aG_R~@=JFuwf-bKThyVlIMlmhOD?@He(S<2WF*c7b z@LTIKZw_L_8wYL$u@#hdO%;O(KHl;28_)RtG(1hklt4}?eS=nEt0Ph*=HYGQ93+2F zomkUARuN^`vp`o>izKdsbGcW8G_d{$PX>%tJPB&(mq#ZwemP>3$t@X$=g{jS(w6bm zd&Nr9c_qT|_3cK(RExN9#i!?Ob!#kzFk_5GP?Xf@WEhgS2JKDsw}xIwik+Y8_|Oy8 zKRezZ`Bwt{&@(plAHgp)eLqTOZx*7<-OV99!wEH*f#KJ7E zt?lmFgUP{~dS$42CZMl~rTewen;4+nCoC9W5Bd0_{V4B*+`4Ba?YC#KJ0*3IGXNM@ zDW(USGn&4;zCYv~;Vi#4EYSnlLf`aCl|4LO)j$%nEZ>iV)7dqzR4Td6gIzLTf;ng z1DDF=2iy{q6}V+KbMQzpZl1@R!?oE%LX2&)hlJkdQ*taUV1|{lncU=g)&i5|r1&;J zaExKv{LamXaq@c$LfrrW delta 1139 zcmbVLO>YuW6uk_T6tJY0OtGbu4;R>?wIB#4)})Y*8Y?tH(w)f&ShN(7LQ4}r;>MMU zA$Q}#Mcum5WD@t?xNv1$)foSR(Un`zdjqK^#H8kBCU5RN=iGbWoVWi>dDT zJ>giPo7A8(RrnyQ@^{-rC`dU(+Ek%!Dq^SM5#RMelw)>3pBPz71#v4n`TdD%#g2av7X!h;AUZCPxFCe?Ii{zUscAA=8qo8PpdCu}Q0l)loyV zTST^leVBs%PDNA$vIdqJ&jVefJ^tpHa{a+E#+(6*tBo@$09c|nKS+C)%s~r?l^|Wg zs`rNz)J0jy%njn^VDd=##r1$O@2Wewtc*tnN1l_vO@mwm6R%0xoulrJp6a(Bhrm5G zX}E(QEqr@6ZXEhYmH%L0oaI_{(kF~3#x%zkdogAS#?txZg39Be8UA$H&CRp(#`7z2 zMUYMpCkbB)mx^Dn8?Q5)7ItRdAA_)KU*&4rGvlcycjX<-R7 zRR&(?nD#Y0yf--zIuka@pwAL)^!Lc?u%Eauuna$m28=UTrz2_}zA4Kql0(A0ASuJr zowFEs8*gmhVfhObHxY@>XJu*_A|WmrFu$yUVd*4XmZBIy2~%k1(V_D1Qm3AdD!&0V CE%hA$ diff --git a/PROMS/Formats/fmtall/ELFDEVall.xml b/PROMS/Formats/fmtall/ELFDEVall.xml index a981400b1ef0d8df5a76ec339e2f68c1a341f5f4..5b762e4b6f320d373f885fe5ffb49f9328e9860e 100644 GIT binary patch delta 196 zcmZo@XX^OFxZw%QWHDBw$yKajlRXjzCiAgXOxE$_nY>PhYw{U3iOql5)-g{$#-%b@ zj@x9j6ptL^<}JK_9Fu3b3r$Xtm6{yj!8dt=KhNeiu`V`{;N}F`0%kBnK~YR*@&iYK z$qrI{lLN%HHeaxv$GG`{qYvX`A;&TxBZ7JI5?86oey&`TFSuTq{7p=0GlzSb`evaL g6~@hb@~v2atbfc9Zb0Q3CI~C8_8OE`)5yXE0K9`nMgRZ+ delta 1207 zcmbVLOK1~O6upxlCTfwysI5&+6C?(aNSd}|X{a%@N@hT@|&#Jv=BC)V@cOBRvYREC6^d(Zux^UizmTYK`{^5MIUpANa5 z(=<;NDo~Nz5iftU#fJTqLZnVbTB8i!X7Cf=I9pD2w?vXp5KxiZ~B&w`{W)=o+CImBvmil5HV zb)W=AKSe1F5tOXG^-1(^0Mixx-#$HEEEG0^uAnB4ZA$T9#0GiHEJ}uovk?5eoTqZ- zjuwhgLix*#%Ir4$9{^89bZE; zHUpCy_xZN>Ss5ARq0`5F!hwRMA}!tp$vhke_i=k5!qu>D+?aTy33$*PF03hxDx8o- zQJS~hId17T{-b~5i}B|F)*6{a19@odOoX{FF>tsy zdNt(Z*~DhjoK{B#dEl2oF%N6@>a+wS3nLaOVC*GchrDUroPxaCDFp9JF~^PFT39o- zN)xu@X893{D#T#*tHl&CMlm3MS^Le)b)?(PJ?km6^e7xVM!I<96n>R=bF1`@x9iV% LZsR4l9_oJqkna`O diff --git a/PROMS/Formats/fmtall/ENall.xml b/PROMS/Formats/fmtall/ENall.xml index a7b8cd997dff1bca615367c8ffef371d23a5926e..573856f7f80b33a3c729e3c242309355c2c292db 100644 GIT binary patch delta 169 zcmaE|m1)~rrVU+;llL&1P1a$Go9v;_xA_#48RO(XMqHDXSgIy(VwpGj2&=&48di_V zY-|>j%h-Nwe#P!*FnJFX&tw4^tH}v^C6lcz=S&vR@Yq~nwT)%+BzvjJHuhYT_u1c> z>>{DGnaS}C%jPGpN{o}AxT&p@n*M)DvX<#)i$w0SZOUYpe&p2cOaGv L8${yD3;`wpMpr<4 delta 967 zcmaJ0v@6umEb5tOQxHYpTB62V2PV3O9P!32}OMk<&OniN+eZSt(qn3Octb|Eby z6e<+qx^P)=C88D{+O2~B!F9n^7X@+Ss(9{9vap6O-ecyRGxwe|bH99W{rv3O-7*3> zs!^RfG)?pP&r^_cl&2O@o6>ZVzr7sdEh8SzQUknAZE7l|O*f%xK-Z!bFeRXi;FtN6 z(Fz5r09^FTRKZHLvTycK4te~}m}}DT3cWyR7T&1 z3SU-Mm*^G@mQ=(JbukXbhj`fYr}+Ox>F#AHt2kpzeRLIfk|TmI*yVb-&QgJLm9J(3 z{3>now)>1TaHW#F1%fx~TfKA*%OYz8j!F-@6PIl;5So{4q6p z_Fr`Wx}OhH->nmks8mz1RHaA9tlq)H$z&qA^FIB{JU@e_e$S3%;XUgzf1Nryjyro+ z&PXia`DHj{Hf_vcTVex~ighqen!`=jfC?`;)IB@Dr+X#tqL{CQGmyO|D^$nEXsqV6qTf#pE-hJd^VTxh7v=li0+*iFxulE|tk@ z+$NLFM1&@<<5rv8#ItDgGTuJ6$r8c>lP?HzZSE2AVB4G`=fF7miqfCSezG@!oHpsn z20-Ztu6&adEVMSaSj}Su3QU^(frn+YfUORkGg-iP+vW%MJWP{KoKz;aI9-_hM?`7! h9_LLOo3B);Fm7IxyNn6KnpF4($~sW`0mRZ`1^}iLO(XyS delta 1266 zcmbtUO=}ZT6upVb*uL)24GzPc+W99RzRRlge%BqMF|GB ziIy5Du#AEmGF+S{Xo~k8)BMrV?_WUa;&c|cOYp6rxx8!#9=uagdEA-2m!lRiHLO)Z z92(I~5=z)DBdchsF5?$~YQj1Kss*hY&BIHhHHqxBoR!2a!B&%AK?>6~ic_SQUlb|Q zNYO+KotyeQfa%U9=S%+3=UVJ={rlbx!WM8#B_u6lX(mbHw$4%v#Ei@I2BLFn&}|aT zZ|xq=yZdzKu}8|75K}i3-Th^ds0x1bGGPnXJjxHQ&+oc_+Nb}^^G{~^dDy4-dk?IK z4iUBJ*;APzcDV=qLi2(ZgC+4TSSdlz&^qs(@Nhep*FR4_vj}*oH(U&Y7z?4bqIA09 zP4c#Pi@%?-@%F?Pzn^X$#$SJU-etAR8u@9;7c#2-SDwb4i4Mm3aVo-3QbR{gMeys? zr*!Y~&2FUzE})eXMBB~BB4jWACXhD=+^6+dGrM6mhdC58P=z?l=Fm>*!)pd8QMU diff --git a/PROMS/Formats/fmtall/EXCLN_00all.xml b/PROMS/Formats/fmtall/EXCLN_00all.xml index bf47abeb7246bf9c422af606a1b159b896d311d4..cdca5f291ec05c2249f10cb81cb1fb763aeca181 100644 GIT binary patch delta 94 zcmV-k0HOb~{sHj$0kG}?lOO^Rlllw}vv2|$1hdQrgaNax2tGKIRzVt)K?;+CLEf{b zLP7=DvdG>43riz9uqKsx1j`g%iBZU=tUJlEfprLMO za_c@jj|Y3Hg*Y7k;Pxhbu+yEw2O6Q+uwu)(#EyxQ)#! ziY-jOylARGslODiFagW`3uS6ATvbv% jbWEWh?RR5t(tQdEGDg10q{|Fe8QdD;Y6r2l}q)8#lA{fClHU?3mNe~o^ON`o>6C=DnFWvzMPn=gYYHFyaNc*hdS?sPL}9LILY&5cTBs zqLA;#;FN_Tkrq50V~f=aKmG6jqDx2+t)MQitRXcJ8a1akNpeu8xXaN!l-NF`giVn( zqPxU4h&74%vfCE&Zq-z&NXL+`W-R;PSDxGIlqsPakVvDLiv#HG8Kf~I$9IIh6{dQK zh8DsBK|b5@i5}I#33oMlv?q^2d(kyLCGYK|e6mNPKd5}OU-CMr_SfUMS`ZcqdW7c^l N&QKv~sPofU=o{>rXk`EZ diff --git a/PROMS/Formats/fmtall/EXCLNall.xml b/PROMS/Formats/fmtall/EXCLNall.xml index 58f56bcc82270513b9e2186ef328cb0474790995..f024c73627ca6d7a8958e90629a0aa1157396a6e 100644 GIT binary patch delta 252 zcmbPska@#)<_+H%Cu=ZG+x&qkh-q>GYtLpiHX-K8Rwi7Vqd0jOCogan*u0Hv8{_14 zJPDHnc6## z6XRsFY=OxQX#tbt9Jn^?7+g`9tl*iGsp)3{%OXoxyly&Xw YDJF>6lZ$VlERkzJpsbKvV3q+h0ImyX3IG5A delta 1222 zcmb7D&r4KM6h3bp$#M#!2GLQ*Q6w#-nbAzpeoUqq%#5Qmk)~;Z&Ql&|o|J7eAt~rtd(nf}9N@6=YyGaGDnT4Fw1a00-M%2B%PmR6= z5|t1yO(QgbsJ1REipav=fi$pBN)m@XczwK`qTafB@*$rK3WLDi%LP{Yt# z&}B4rlN^q1g?OX3H=G3rTbClwA%rg=R|Z5K$XWHScG=kT`we(>-=V%NILrfxAP6lb z3wgIp*S4c~3(5g`9if2YRlA;Vwfj|a|4Kts1qOL;$tu~T)6ybc1;^TgJbC6cX95TK z!_9t`X@BTzZPpzyHB@M2;ZT;2=whd#w>c4L;!Gi@CXTHb|KTvE`a9n@hh>n2o!bDp z3p;CvG2cBN=Emed@t(oyv){npsU`3jt6pqyQuCq};qt93@sTcK7r z_Xu4>9rIYyQ1h=jjB?iMi2P~wE?6#Gp9Z`c6)^eoD`dFN;Z~rl|8O41xX2eY(YHtK zZR*BUWA(vdi0&lmhEi1V%mc$i-8K6&6&yi#i~4`2;kTrpGNvxQ=`hsAjgsHf-s9Ro zKA-f5JpCy~Cn)ZsoEI;Bo~Uk$V|BZziLKAxs5r(Jzt%3n0$z%Vsefh-{c3P9Fuo(N=)vNRuatN=@n#~W)mN9}kcPvUK*H}*2Y+=>I2qYvJH*?soV1lr| zICL;>UgPwNWwKs4-z3eT%_bgO7$;wl6_|X%nQ!t2ewN7&;X;!YJVYkf8MKQXctYJM9695%Pbh-cl delta 1581 zcmb7EO;1x%5WVjOQlLb_m&iw@6&FH6X`!`Xz~oUVYA6L-(?sK9g!6BjNFl3<9>pc@ymGOl!?t~7}L0TN?kOo(UhYY7j!(7fEHckY=pXXehGr4Q<@ z@9N5N3zbxr z80@3KhQ+Lyz!wuKaSgi}{3c-U5Ql^t%Pw}JJ0;GH@`^+B$8z_qT@1o622CMwC%_ZI znuP5n_I{{Hf;|Xzqmn&>h_g857_2-gy5TzxOiT<(4IC#9hH28YYTBwRpoP2xxt!Z1 zZQd)T=Xqz&od#cA<~z9^V;o$}9K@Q&7n7N4VC%-o$e!p?D2X9X7{3$n(cmMskh`W- zFU((6Dm1uVK!SZpj#EiU5*NKLsBenEGH5xpKzim+yTaU=FBKhy0A1=R;#}&JW@ozoK@u+P3-Q$cN7#JU9*2w^flXU zl`)nyM)%n(_w6)Lhx3bRueErot7*n$TW)$|+B4>XYiy6L!97Pmoi*FR=G`xqU7)AC z_FgLUoHsd5dFGW}28W^_^ew7;tzVDbF$K`0?Z0yxxpc-e>61@+2z`)}k3S_cozx54 zWvm27KrOBN2K5!~g+j^Tej85-ZZhMZ_&*nR7%vyCMFXuBw0^jswkiVj%+WwAo(B%%4~=>G_K3Qe0ua&t<8q<3Ktr@6)TNgd%UJrXG1m{NP}gT*iE;BiW+BDNF{)CN>r}68o~8D}dUH{Z3ghMj m$t^5k)?_vdp~?G7S8TS+5@Q02ykXwlRPc-$qH0Yk6B7U%7$Wfi delta 491 zcmdn?nsMEG#tk6sGeO}4 z@|U^lYim(|pz~6|0pSM}EC(B7zF9VLEvq;-DPsmBprj__=6C5Am?W{Ouw*b}Fo39e mlzoCp9-A6dpzlo>EPxoQ@?8EQCTVOcjUXx^=4~lvVgdkklW3O! diff --git a/PROMS/Formats/fmtall/EXEBCKall.xml b/PROMS/Formats/fmtall/EXEBCKall.xml index c59ffccadb8687c86ca5d59b943666066c03c6ef..146af37a5aef34e7426132be083810b403b83a57 100644 GIT binary patch delta 312 zcmezIf@#5ZrVV!NlMC35CSPIinY_$EVDcf3s>#bZlP2fLb4}Lb3fTOLYaQd{Ej%id zFY!rCR^gSI+{9}$c@m$+=3jg^jGMO!+~VIXrMif5bDB~M6Ntq(`GfJP$x?Q5lh2sz zOg1nrnJlI#Hu*#(-{dc*o5129%qBtQS8QHkv5awYmDN5V_L{uTI%Bhxof+fg3fnRu z;{h{}uwdLA=iJ6Pxh+&BJ a<7U5Q7nmTdgjFY?tb%oipscb@OiTbSIecya delta 1655 zcmb7ET}YE*6n;0Yxm;=5GSlTs3PzaUrgJK_n&#-oIm?L<6il6e&9&xFKLkkx)m6lS z2+~Nfz%H`*prDAnj3}a;x+#dR4C$teu4nun7c3*;deI}I zkaxqjMGT34tf)wdb2ts+8;5+4*e2ZAPO;RwPTHkgdCBd~CtKF}i$~!X1*b5uOt&Be}?+7k(T!ggt;2m30UpRs%Gh%VM=5QWW?t`1Zpm z03XSe);sbkZr!9Fv)(in1mM~SDor58$;Ks+LbGdJoLalIW#fxFUMzETOZC?VsAB9Q|^dfz4Q){7Ck0hkn^DECnmhPRk#SrA}st zP4vZT4hS2+CH%hsdFc2dR?a#K`$RH$&^>9{5wMg@&e?HTv_d$~!1MRrGlpGu>q4!uLWW(56KL^oIaWSB(_4mwF>)Pnx zDZ?$OT{-{rWpv=>qw(m*5x3eGtdpjt#-==aco6Xmh)Rd)L$xNFJNSh0|HJ8Z<|;{o zru=p~p{y>|D1{~a6o~OliY*Qqrm4`lzm#nau4_J2M$Vo~G~%)`k$PkH3yI3s<>AR8Um-lO_?1y; qq^v>jD;mI?@mJ;&BO9+!@J6b!74`bWY(|lhkw-JqpzchX&3^&Ge~haD diff --git a/PROMS/Formats/fmtall/EXEDEVall.xml b/PROMS/Formats/fmtall/EXEDEVall.xml index 68c53f9897d2ab48846b5c11f2fd2966737edc77..7eebb869024dd08431c8f620529ce382c0925ef4 100644 GIT binary patch delta 235 zcmccA&h+3f;|4jF$pI`zlee%$Og2*&nC!(`F?o(S&*XosN}Da%HZV_~!6h(RgiB^} z3YW>|TU>pNo1gIbaZL8|5}NEIE3g)hPmf_=R4nd+^;{4_YZtqV}ao! z)#(bkR3IB)n_^U?i?ji2gU_WRJQ7Hph*239mm0K57XC_j<+;_f^8Mf_uLS1JJgtMH zMQgw=QJb#gvFQfg#>vIE3HvNfP=f7fgkJ_aan0RAR;|OP%L*m&4RVlC;w^Brah~9B zM+dnS912Pu4nJS*7uDdFKaxZERa%753gzKy$}kRvXW|yZIv}%DnNonpwn6PeUITJn zm1LTdl;&jk>}k!jjEFjX>kw}%WDYSGU|oZ4K^2B*e(grs**qZJ@I#~0t7E^PTFw$k zYN(>25^4#uvMIc=uCLXVrqe6o{AzCeao-W~<6yZjU4&HK-x^rzs;9C?W!32t*f$_^ zL1nqQ-#6ZkCPk;e8v0iPu^Y|%|08(L5Z2HkLsVmLM)=I+u~E4|vK6{D@?W;1h6Ta$ z@T0Lf-!n6!Is4R*@RQzfxmj}04UaA;%Pyv*qp%j5tBfyoB`5|bSaEjH_U zY+;;iVAwbLgM`*(1)E2c&w1~d93VDnbAfLGBZx7%z<1Z?mVgP&letvnCJUIdO<+{^r}36y1Yn^KEu#elzo%`DW(+ruy@<`mDi1 zw~~_+nuS+f5Pc#*OCB55TbvHNXoF-@1jK~!;md==|G}t~t|#QutR>vpBnE^Z@_t~u z#FQAt;};=u34fD#k3fDzdcT(s;{PY>SI0;)nc(ud-2z>c) z#vnV6|0XaAB7zqT`(*?lqE11}ahQEjG{bff7{BO|JUCVW9wz8hN;U;E6KNqnBaZVM zBjtPwEytfedkX#nGUu`F7=!S|p1n8|c>FS3H@r1N)Av{OZZPp9P8Z&zuyMmia?yXp zuPNznm<%DgHYCPrj7SF>tt1we`2e4RW1l3>#WT=Ta4{*JanfAS3Q;9o^fs}&#PHM& zi$3TEc7$z#v>&n#Pzk|Xke24tDJ`jn7E+Sk9%w_-b0b*rH4ckb$bvv}jM$PIg^89h zauwvL%yaw;D*IscGCB~EBTQ0llGhTsTKbTfsm~;}D)c15%01~e3e$yTdL?mCkCcLm zxkM=nz&CB^qdKD$vWT?Ro~N%{i}%xOEz1^-&c;qWhv2}e*VffR7S)wa??62)TQfn;X+tK`{PJ0PspV{kyivZQn81RSGQ=N& zt=_X3<&qZFdQm)EJXCInF)kg^*kTArbAS zR>-DtMz977>7%Pvf9zgXs6I6TR`g#jbGzas5pvjV)KIynz@XJG*@r-mXC|<{D4427 zn_3ay#opMS(P-;L32pRTp~W04vuHA>97$BRCNH>NOw`U&bYmKMDPd7jXKJCo=pFOe z+A)58a_h7~aZ%RHr6=8f8kcUSsuUGa7Ag9>`3*JG3{i~^*9^?Y-4|+}8Kz2Tn1sVP V5#;KTe!tfP4S| diff --git a/PROMS/Formats/fmtall/EXESAMGBCKall.xml b/PROMS/Formats/fmtall/EXESAMGBCKall.xml index ddc29f8d498fea31c5f62b1d6f43a51aea934cf7..1f483867b2da0a556c56277fab93b62d26ed467d 100644 GIT binary patch delta 278 zcmbRBlIhTOrVS44lZ)7mCSPOknf%OIVDb@;s>v%jlP3QO;+m|(6|ngY*E+_@+jvwa z^YNNYZsE0=JcZ9<^B+DN#?3nfp7C$Kq+r0Z*+_K_-((?^QMgHg;x=lV{nM0T~aN zfrJI)<_70B#?5A~Z&)@bc+F$l9N-(mH2H#Nz~l!KMw{yb8W>@m$#nszHZKaEz&!bu zirnM_rfic>g`b)1BcZhUUqpf1=8}ynjGNaiXkme{3YJ}9g0Pxaoq)0?tvdu_sWAfp DrN49h delta 1609 zcma)6O-xfk5Z;zz!J-Yc6$L6F@z44Cg#)1CQd=G$*)XXTy# z_GkUmBSv~_Ei3L}{p>sovk0Y++o;pnTwB9@u%uXoO|T&Td9nCDp0(0av7Ig(XZ+o4 zgvqc+feo-pHjYnbNp=al6nhqPql6i*i$Gi-l&41}ZC>nm&P88NB?+ zA49GnRsyzT*mr|T92NS(Fe)kpQFRhtUWc=fvmV5b0wc3w!GqU|Aj8BKd=QaIMEKcR ze7tUg#prHPe<448g3{M4^rh(J=|RLsgd&Me2BV1Mb^Ea<@X1084{G(m6W&s52$f{y z58!tkF&@MSri!z8Sy%2s$T?8(feb%nOeB!#+fGMg5b%pg92Cdm(yHi5q)3TmToNv~ zi@8}Vm73Zc)J#K&2*Wp`DSH&wC~O0ul0>#R&EB+8uc?DRR+V|Y@Fqp(F0kO2JjVK9 ziv!7P8KcN;TqMOVAHJJ&$-jUP1oCD$OWN-2%4-MOyWn_Y{V{gNw9znoQ@ zMW&mc>okCR_v`=mgVfnFqOqA>4kgjHS4V5DQ+XUK1zU^*9ryLQMrFNo!%&~ST%UO5 z!)St}mGv|DaRf=A0E8B)QjQ&xt1Y3X7m&-^g5NR-Yx;H z%Maxfh0hn>+_JLJJEo(G-e)}bHUl;cg`zkuSJ`Mr+EJ%c@e8&|5aN#`vN#^+oJPe*(FAv`-in=r5FiuIuKVj$tQ z`O)8DF-2u0MRNl-zn#P@WIg#9RRWE!daO*^aK2L>}e)gID_M ed>A*A(A{lVlCtpVYe8i`kV^%rsb0?O_5T1$8h+sb diff --git a/PROMS/Formats/fmtall/EXESAMall.xml b/PROMS/Formats/fmtall/EXESAMall.xml index 278493b4e52152a8817a54513636ec2efaf0df62..26f9b066f624aa86fdb9ac06a3852b9c84518d49 100644 GIT binary patch delta 330 zcmZ3npQUXR%Z5$NlbzRMWm3X8xrJ3=^8wR+N|Pr9E}DFxRA_TpEJIasq4!R#Vlu~wy(*GoOx zOG~xM*Gt!tMx{x(hUpfi@kA*@cd*Lgo05qsz;B8l9P7q9g%o*xH$l@VF9D%A3T2QX zpa|MnRLB*8JE`vfrxreTaR%=!T~&dR!- zx2#s*2&_>+2*H{H+z8%j*e+u&vZ{y(LW4=(wA#72uA2Kw2VFuNbr*V+CJ-y=i<;Av z6}~o6PY4kM8l5&PPA6}aR(aezSRy(~5m~5|L{a1C!w)oDXz-<6JT@VbHML9mkw2?hPSD!K|_Cia(}bMRB^gewe$DV<4yztC<7%!PJg zZQc4w2^G4$ckCpfFrP%s@G$DGADOwc-a#U@cZ^U?iy?0x4{-|HL{`nBWwa;qP;5Z3**&Dl{P=R=;)PV zh3GcOXYeE;lzv}#x@o*$5M39PooOG}rH_{ESh+R*x!0IU40k|WY488sFs(vuEwT*& zjyxba**~o_`$*Yu=FY57+s<8^afEPa;`*;;5V7)jH)~IR_!Mn!?QW6bev901_&R5* zH;QkgRy@trCjCBat{VF_Qxlz`Hfo1oxy7)QU#3|3dBJSFzZ|kDV~Q649XZfp*=klY r#vYRG^0N}rv){w4O`9g_2g>O*BzZWi^YbgsjeX4y!C>(2jOMK#s5yt%q-f7z-EC#(e3rbk*^6*&akb-hZ!|(o_Jwqr}+rNE&gbf$k zL+e})`5Q3VuE02Gf-yS6+Hh2S5NwQIyU_o-5!15<=i+%0e-@f}C9$bOi6|URoeOt> zXv&LhdduO=o_Xx0S`^yRTw0D+ehW&#+`-yS?0q}0ph@yi5V;3OhwV`9iU&< zh(-m$v_;-JY^5m&O&dL5+bAnIN7+t_-D4?8yAGN*9$7DYC~;r4-%AsMWw+*p|JsSS At^fc4 delta 2010 zcmcgtU1*zC7(ORIZE;P1*0ouieC=nlPQuE}YEp~%(2 z`<&-}-oKM?ezbk}yY2ddmF}G1?idwgA}f+2B_0tTI%spMj5RLr(?vwgiG;|A6L7^u zQ7nlxPLBhe7o*}iobzI7<&;}??1|&J2!luHVjO@X&IJ+2iQ)V`Q?b%lTAy08#hd!7 z`NN2muZqG_GzUdOh?&OK)9|Il42VV{bsqnLK!A;~)kqGXt03u=-a&3>i@N2AwrXQ= z6%lNME(1cg7DRzUUMDpScPWqdlckg8=ftEDoudWBFjU#~m}?qw6Y$0G_gP#G;c{6Q zqWLJNkI;?Oc895{9FpGhYW-obr4euf1xcf#6&dreXT)J}lVhXG&NLvK5 zh@7MNWJHS2d%G!lu9vR&x2Qk$Iq3|6Z~;QcK^rjwuw1`7>Nz4^Kd4Wj-BFksk}k7_ah}DsJpPA};v@twf~WvNT;jr}HkhJ$T-YB+iaAJL zkM_}->E_OV^SatAZ9RZkoMusN+odEA=u2iwF@&Bmgrwj$Q|2^-!Y}rsHy(_hiKuwZ zg2W-@4CELkF;FHSr?SCkdI!WHdb}5(0kAUT{o+x2VXzgoc4H%AoD6Qwqwi@Hi?<_* zBFq@mz`epE(S=K1^+W&DEsZ=tvm!!2Kj5R^f;t@ztXA2yl`nm=366(IZ?e(D!H=t* z)_o#C`vN}d4fZJi&@Ww-%(}gmDzV&v7&21FP(o&l@n*X*fV95U-OrCK zKL``$=agrkSF^g$eoAD0EU_Yn{&?-9Nc|GbVBdHs&51~0Fi+MLX&PJ3&nMn$_1^0* zx3%ua(OiCGM<{W1k2-K=r>u3T#MQ_qBhWV~`b7&R-#J%%!C<=Q-62W49BnkYy2Cz& z^+}S%FU-j5u}tR#5>FaG664Tt+UQ|$bsrg>{l%=m8%Y%4$9kcSb;B2?$qFnio3)rV7&o6_kHh(dDz_|H?g&fo7 zUDh>xlc&_VP42VO*nGgNOMLQyIH}DoN&B=Xuj`YVe4+2e&kPuqrr)z-oUz?Tfw6%F#9y|(PL=Tv6OxpkCSw^`3ar#@dYm33&vrdM##v0; vf$Eu*KViby0oJu=yMYB`0mOjqK(kfA3Y50n*)dA7A{*<%=)(*E{R3E& delta 1118 zcma))%WD%+6voe;B#Jd@dG(v9%_)Db}6FB$)b0N-WiiVhGq) zh$37er4q$Ww^n8`APBm1r+YW*U*N)36!g0@(^_?u61Ysx`R?z2=kb2V)_7oB`YQ3@ z!WKtAouVRTDMyE?P5C7CFprz!l&3Tm=pw=?nxtvEg0JHcmZ+bm@Li(m+KatxEC2qq ziI-zmxd>T~uF)t&LMZ+hv=dQ&E+;EKtG#pAYH}amDE;E|A1Rk|tZPO(DHszpg7dm? zMInmebkl(5vjB3R7Jt|7*5YHpq;VsK^D12Q!bd-}<21>?g}q86{Fb?T5x4|sf|97O zh>8T-ue^%xk@(GsU3BA)o=Aa|0W*hR0W@(@h@*6ng4&CEemSQ@N1?s}ZyHup>9mpG zXnNKMP7Jgd`N*$nJLw2Hc*k9*^0E6?v%^h8G>B%V=>pnUeHm|yOy;;i?uzr);F_bR0)joaIk7;9GB!36Fa+f#ei$~-myAvUk>lUdp7GE)U8 zszNtwF=Yf-F+R7mDQl}4BSZn}#DdsQkp5Ncio1EW5@l8CKUJ&fT#IcDAnQ>!WcdkNz4G4x diff --git a/PROMS/Formats/fmtall/FNPCASall.xml b/PROMS/Formats/fmtall/FNPCASall.xml index f931873bfe5b025d23d10012768e0bef3b0fa01a..f64883f9c406f11460d82399d8a5332b832f0415 100644 GIT binary patch delta 48 zcmV-00MGxpc*u0H5(1M%0+f@eD-N?515yFAtOUdZv)l**9g`*|B$IX~+_RV`v=6gz GH^>CYQxbdt delta 422 zcmZut%Sr=55G*IJqa+dng1Ceg@gQ!@!$a_}E(u;t#0WWuP0+=-fw=KOPJY9Dfd}ux z9`pkQALwU@zhU)6JV+QCdaA36u6~W4t{-wrtM%Mc0|ywPj{$a37)Q|hi{p+!6* zet~0lO_uz_KUDZl^e`l2fMR^FdJCIJl(o@CK+6cH=#X&Eu}jiE(Gy~a#Ky!zovr2L zbn-coa^b_*ZlX}PNS#nRg2xKk$tyg^n#bFp>wi@l*g?B&cas=w@SPmUm)&-Bs@*T)SLg~oZ0osYAB lj4o4)vz+N|?QwCn&Gq``t}TLB#-<7fJ18@c6Hlw3$shj7Ro(yq diff --git a/PROMS/Formats/fmtall/FNPDEVall.xml b/PROMS/Formats/fmtall/FNPDEVall.xml index 263ff308bd5631ec7ccceeac7b6a5ba7a57e4108..b0fcf35afb6686b11a66a7ee754f17facbe7868e 100644 GIT binary patch delta 244 zcmX>!n|anm<_$?Ko6A_Tm?jIchfVf~6_~8R&N6uid&y)SJHE*YVjPoiZQz^Sz`?b7 z5yv{_$v=1mCfD$YOg_S6GTDlE(dG!gXPlEoRCFfiDM(Egi0qhrz+Gu`j$|3zW)YP< z#?5_-9!x-1lgMNTZJEtiEY5IFcF^$HY~^ghG#O%6#Fnw)Ta$L5&LGE6{`KgyC7VFCaP3}H$D delta 1262 zcmbtT&rcIk5FWPG28yvUZVMDzsL_a;Kns+XXe@21l?Wxa(Tj@x6|B;h07XoU%EhBW z=H!o)iHRp7ZbCd6PgsN1aBAp^1o_6iBwW@Tq(?xYzcO7oN z)7rpqZB43BGDYX{y{U8cQiy!oSKEq39R$I3m_`vi2Ee2M@Ll`yuI=C%J%AvW*cyb+ zQW^V-AuT|C)X&fDVZLv7w51_NSOv0zB+jf528bjaMP3~teb;xe=BANF&%&%=vqjvd}({JG}=uf{$d z{tI8|TZlih#H9EX&4F|pPYIVHr$pYSxqZ8l^;>5(*~u-*mVLWVN6xhIhXKb@X-Q9T z@u(+eu4|`aXdW?JdCb%9nqEY&h`A}E*%#toEqFG1MNOgm#n4qT4Mk&A{MyggopsvN z7niIqGkXsOB%*bBOEEC$VlmCU3_KBqA6m%c$y14p8Kq z9HXkW`Jal0%;XDF9-9w1MlfzJaAslx5c+{#zg+prq2|dr+3kbRi}HmW@eP delta 1337 zcmbtTO-~bH5S}h1?o;<)o-HS)!fkY1;J#aAb;=zN7@elaSzFn1Mz2ISY-<|iFXJ($6*?6gadZWG4 zoptA_NRyPKvlO5JJDuZxA6dWu{=86A%8f+QcQjyE9EC#FE6VgwKI51(dLs zZCp%rCPk72kRs0lgvx_U#oe`4;WTBO@nx|&7UNvjaZy9iMd zpf2JoW#(wzOuMD-6pe9DnqEePtq&Mt$HM1|6GCYG<9RlyLhtC2mvo8&w zC_B0Nns>_x4JG#F$f2QiWkXfSC+#Z9og?JhIX%D)nfn!H_3^IO eZpRbGI><9XeF}MZ?X%WqhwK6B)Nj70F6|e;u_zS) diff --git a/PROMS/Formats/fmtall/FNPNew2all.xml b/PROMS/Formats/fmtall/FNPNew2all.xml index 36e0ff5afd778961022a1dbc6e9d2594bcfc1770..3f9a3bb4f328b7f054e611b54ef2b86ccad29f28 100644 GIT binary patch delta 666 zcmYjMUr1AN7~QvfcbRjn%P_SyWQ--UhOA-3hZ)2E2zlGqC|%-U8jUPjL+TP* zIVy4c9JV(}7}xjX&ydL4!>d+VV{*6?%fSwc;5JXai*~@? zMF-_xYk_u_+F!8s^I%tOP6+E7umjj<2^>nr4XeDO8eBq6W2)^pvq_Lww)$YaCT#%Q zl%SK@#=y?L%iw2)1dOu_esHnSEeN2yBw*#6hvhHBPBqH}N`3$?agD@>N`4TGwJ z{MrmVxTuzYxDJInDWyFa+w&a>z6i`}t4T&c>5b`V&%05OYh(!&b&8{gkGCoQJK(Mp j&IDwX-3izLW#v8`)EnxxtUC;PB{c;-#~+le3^VW#ZoK$t delta 2929 zcmdT`T}+!*7(S;htr_E|d~}Reffdm)*3p*If&1gP105ZMBAZS!2FQ;L3RHf!nPvWj zLFPt$lYK_b<`(tNh2=!M3leu@vdlywQR9V~(<|e4p~-H%F+S(}==l3wvrE%_r(e%` zf1c-k-}An`_CwN}e&8(P-iBEX z)+nAlw&qN|Uc!}Rx!uj`A?Tv7Y(>RhSX?RG%wA{5@sZ{xSToE`u>M8ge!6GdSE$?2 z9X8-(1fO;dL=ZZI(5(g9UKXXlLQ2XK#Cq0Am6-|!cV^I4TS&7LhyN(A9&yk1g~=gZ zNp8*f?!a3un0IQdXp1dX-5%mr@!7hFsUZvu5!QrtOpBPGm1!*DAF2aTt8}r6v7eI z!2nc;v0{%tSF)Xpj1YlifHexK7M#ks4XgGhu8`Hf=e<4)om193E1?w!Agds{M2xae zJB#*f8Gxo1r{kLE8myyuMsPN)k@d0d%qRBR-H(b~K22x5U;J2+K=}=&JLtzWmk289 z|C>nAnasbFqgpL$WlmSxltI0Wnvu5-EzPou^)k~+ORHi1EWWRYDvZ31BQH{_93>@d zUANV=!j^7j8*?)+^RaF8>vXmlcYNX{)8!0j81*I7+qKwJ^t5eZg{(-mySRg9r=Osi zsSKJQ$)OXc0`$SY`-v3AnYt`%LZRgFW=`8feTf7m3^&bxx}IiU-b9UU8|XpHM!Iv( zDn4$Em=kG>lIfAnCVsDEJLsgLsbXq8l1g`vSm@@98DeA4M`kTyi4+gk?-p}C z7B24eU$y2MyXe4ZkPX}=-WVA(J%(8m7f+7eup|zjSU6c~w#VD@eo&Gvsb97;VLcr% zOaA%B;N%38gHiUjcErIeJa0e8>FiqT- ziVKt9R2!pt7%JRAIXOGnYpe3rifbl&a~CGFx4uA}I(yraR)?Q@hu1DKwVyAdzIXpw zy)W9&yLrJ-una+Taa6{xBhbFKMCawV(; zGNqV?e!Tfsd3YwawT!=NGW6hshjLi=LR;5Uf$VP)H{@$yTt%tk(H`VWLVKwk#I4~zkw(u(v{g?XJR+sLV$17)j&ts>Y#_2&wn zr_PjNnd{{dHLslatKX*cb?WS4{=3u2m<$#E&8#sOI?B(-?jGUSxS<*d1AE}1+MLBu cOjeR_8M)=*ujt~tOoriK8ID+bFTce91!HQPMF0Q* diff --git a/PROMS/Formats/fmtall/FNPSAM1all.xml b/PROMS/Formats/fmtall/FNPSAM1all.xml index ee33a6661c43c5b671731c319aabbe076106219c..b55dcc96d090d2d35c73d6d518da3a102cfa9c9c 100644 GIT binary patch delta 415 zcmca}koCq!)(t#No8_3^v2C{F+`_WijZcGl@*+W<$p)4@lm7?_Oy*N&+Z-h{fpM~) z$Sk0sz~lyVmdP@r-zMvcX-uvWGnu~3k&$nbc*f*a;ysfKBupk>k+`;bozy<|$vt6w zn|COc$WGQU@YuY@Ax3_3gR9hLmjn;~$qohvoBfJp7$+MPPJ?oQ);=ngn%q;$HTh7y z#^euelO_k)sZFjhlG_|qeuibUNsS8QWFWD5QY{mNajuSuaWh-PuIbau92u3i{}E^0 z#Rg(tn_i&JShih8fpH!y5??``F@zb+-wu@LL00;~h%pDD)M9!~9HZFwIhKq}5cLrA zd;%FGn3l&lFfwijTJnwsMAk8G|KrZ+fUInV52GD2AE>PenXeVb_=ySbEU;Y?+moUg NKOhNi2Ra~u2>^Uwl?VU; delta 1820 zcmb7EOKcNY6ur-%B($MTGM@ZQh)F;+B%!u(OrZqD1lk~C47Njp*x)215;}Gq*ZDx% zv|YABm9E675|xU&p*zq>9jS`~S+YuYNFWwShz$z@5~?ay;=CD?gfa+K){NiWciuhc zo_F87chmpij{iojXLFKfXp%JQrw-~ct35BOIzx0E!7_qhQx>By@W}7NTC|`4-5NBj zHeL6n5~SldLkpC_f(gKmAm23pWyUO(Xb$lX3eiTSOkQ+Dn!j)E^{PosmnpX)Wq~FQ zv0EtBm5jVn7in^Y7S{6QXdGHJ-lqoZrJ5YrCuquH=9TSD=JUEG;g>ZPdF6YhYZQPS zgk6b*t& zmqzf(z^B`WfX~n<)=Xmc6y{F>ci1+nm-bSWzX|N)u|QqhMmKOxRTbW){ur!iLM`K9pNHNNXp~!AGFG!f;nv1l{zHv*58Jzj zuw6zTG-ZgH#*%52IfJ;|!6@yfI6qeJ^I4^qADwC7OG=HFfv+W`gd7mbf+aR=@3S-a zI_?;e1#%Jj*HMl&X&ADe$(ik;UW$OX$5?3L8&4ki#Pqb|u@z$jsNYeoWXV?K;h9JCRNQH)oQspjRa zrM9jRsOMm17U}KoqAx*E2Gs}}CjtSIP9vS~=%c*ccaZgb1J@m>F@HVaYj2llM;hgn z``XkAx`1>A9Jp&|w2wKwzp>LDm<`Ee1Os zF)3Sj3G!q^YHu`tm_ILe@j$V)x^f)&bn(fcyT-L*upNh>cY?n9Pr0LLU)f!_2h9H2 zRbTxOhE7*kT7r`cUB9L0#oIGxa-rKLEEkwp7d;~Kb_Zl^sv;eQZSuO1PRrJ+Tpi}m z7j7A93I}r%p&7J_hTBU5Vn%&Z?6fY{i$AMe0Z|KpjIh3I5m)`Lh=@d-6xR8W$a=TA zkwkDzV)PmH;l#%)=nr;?EB;P5^d8y+WS{IwjBI{nf7&f{f0H}j#wfyA91xAxrKs?D zU4@1#)OX`z>>UULrQEmv-Y=Sc?kQ}50l;S6opR`tt$}}H+IujM2bizKiU=*jK$){RQ#c9X@Zutk=CmC3a-T2`VeX! z#*KTIMRC!M;F%~cq;g4ebLN|G=H3sq;k)+mqEGGO3;{xHpuoz>XZ^^^!DrfMdX7VO zH9qP;{!JBK!!g<kpS|Z}G1l$yuJ+i3@Hq$47LnP3`&!`nZpeg82o@@B|x!ah7cgj4TwSfJh&)G zts6rkLk>_yDudGIhs>7Dx0a?im*=Q=lfer$h4D!Kz!{0iJ{y-0< zfW7Po6f6fDW5Qs_V98*@U<{-UC;O(VZ{8C(jZGDsQX`-u3kCxQBL*`Da|Tleqs_jl a^I32xH3up&2Ac{p8>Cd2ar3XN2qpl}>Q`C- diff --git a/PROMS/Formats/fmtall/FNPall.xml b/PROMS/Formats/fmtall/FNPall.xml index 7f612abf3507ac00a3d52ad8505f474d6b2fd87b..fc1d705e94f35b274238b39cd8d06ee37b4fac15 100644 GIT binary patch delta 469 zcmaE`nQg`*whbc8o7I@Nuua|!eMlmjyENO*WFrn0!a3 zXYwLhlgVsy*ETLDw9oW?@X?-RN7oocZOy1lopl6bMr?dz# zZobv(uxYwmAfwXs3$ctP(DpzP^D tSA3d&!HSV%dq5kb0TWckflkIMh|M7H{oCHq$G8NhJ8LrI2e7&OwV!H5NlLPA|sNKax|KtC)%LgG6T77MDfXM@yTSs;N_gjiG+D^{F0<2EUM-JsFfGw+>y z?m73~Hy?iD{MB@Ry<2;7f{L_2IXXZc)L}Mj-#dftG>OGB7T0M8PcP$^?*)5RT=%=h z!M!f?);8C+WQ_0R^4k0Ej-}K&^)x{#EL)ABGqJ&Jxfb=X7O{cm)FI~wt)Fk>!;i( zos~rFGk13yungp+@S8_i48D~n#Bbh@eeE=h{Txle*eX;m(>U$|(*EH0nQLur?1`ZQ zCukaFOi~3Mc)gd1i&duBVYlcOW1!6xG}3%eYBs#;tStMpB=f0+A1u8*hNH6 zS?+RFFpeK%k8!iYPl>;MOUAi0JH=lAvs##57f1b919f$9H4iBpP(BN_vgK`cMi%{I1x1FZoFAHoA zR{=?7C1l)yH3RnE{dL>t43Jgi+Cy$IyCeep`Gjz@1K6+fb5$+cvDC# zC1>!P!N6@AisN1OY#R3l+HwkgmV`4#OOkz{ahmr6H=3Ga*eO#{d^P4V9C6;YBTP|b z(6`xVX7X%H1KA%_yrn7_{_n#EMLwNnkw1G)%`g7hf#YEYDx2F!!yr&(0j zKlmSkU0S0hM-(f8PFq;gnvyk0m1CNF=qwC~Or=}ARq;2~Plz~Qxf54weP9f|I1Jrc zTKSLlGzM9Y89oqVVrZZFUiGJjmIPky8L!WTnLOLgk1h)=i;vFzr9ax|l*L)1qo|Yo zV94@X{l+ssN9M)zN51tWaV{6E58Na&RxCio$PDvywLf(}<5U8|H2}U*@9A={hmGxL z`JQoRl&=`q=6J5wb(kkPq{^n_R77Z)hH&zuwUcqaAB#j z?R=9*8@#HBy5?@K6|(Hof+|cHd{Re*24oq5y|T!D?J)}W!Jh)J@E*;l zVwc~H;W}zhiKALTg_6$DkInpD4&&Me-&KMk6au0W+{3l+s@$(8l}!%Y5`n{PJg+Gy s%d!o`8yEO(P1(}Nwd%yX+~1(oxWy2dZ(QQL4rPPtB?RWyWgc_<3#lQxu>b%7 diff --git a/PROMS/Formats/fmtall/FPLBCKall.xml b/PROMS/Formats/fmtall/FPLBCKall.xml index e5cdd7e3363722a1d036a29d8699eb5a52fa5e45..3ac118efdc11459b71d901dde77742f1442efd07 100644 GIT binary patch delta 323 zcmZ2*j%m>zrVYo~CmV1WO`gKhGue%^WAYyvp2_nRxF-8?NldPB=bGHX#kctommlNg z9XtY)ZFoc`xA2%u{>5W6nTyY2@-jY?%|`s+1Seln`!Ly0LT++}e8%Q;O4pb-Ur}S@ z+stL!z`S{f#WJSNUDh5iF6EMo+6_5dX{ChJKk zOzx8xn|vTjY4SNGi_LSK^BCc}ez{KByvr?&d9#C;0y9i>bAVq5<75XfgUNCdDIk5D z_XXIoOkQIxFgc-!Yja5G3&zcT;Ym!JCR+3DW%Qt ylFzVgzK~(XxLF}Z3d?6EsQFbPQj4>ZA=`Q;o2Pei!T1$_llo+mw3CsotHmqQcs)eYDxj>@9^D< z6^5aRGQ{wv7{VUrP|&NIV$BAR#J9a+pO1UE@5GPX(0Z|y14^U(UF&QqR(TF7$12e8 zD**HHP7Ool-x2vevoBU$$4)b74>9arEyBe&bmG0B_vvQcqL=I{5Ui%{~igkB7W5QoUhp zIYyN4g}&v-(VvyGf18E}%flxCmWM?4C8HeauMOdTPw=M>WehG4#L7>)LrAWH!ykVp@jJ_lE#`(S{rcq_#>iU{?d%7!#PVL@ z4O4fAUN|>&;nUh}{T`^fvq{HlBhQ`Pt(G&_cDQ@7ZzI^@9JVD}e8^&|_Wn+Xx_-Oh z+)~cJAFCh;Zn|8@3%47Tx$uqQDTi#K0~EH{+7|yY8p~m#6ef8(BO3XlM dVcDFtLWu<;c4Vyf5#RwzTwUd-_w^X%l|{mR5Mf>f{ToFIB~f>bzFUFZ+LRxp6=GsX=8I(ul12CqhW0F z{9IB#=VsLVsXMW@h$1P!tIv=Nc*ujR96E#m6P)Lp9ZB3zr+&wC1XqUquik%Kh;BB{ zW~x~DtI0AW)_wtc)rsQwV;z%Rn&b~-QTye~*1xdqm(%LnY{p9z_@cGw7nf_tArPepDIA>ecUF0x|F^pg=V!nHI<|v|z3m7InYa}mj9oWfMlEZKfhmi VI1^^|8D|P?? delta 610 zcmaJ;%}N4M7(Jt=i`tlJkVz&jk_h|>twjqnqZT@mf^C9CrGGP<%9g!>bs^fDa{Av=0fqNP{IZ@%%Z@(06$VlW0z=I z+>W`$xuOmGks+d?jD6&In&XoHl{P9IqdwhZi79SLSFyzX2-65)0+R@c1*>qTS-egr z1Jz(6;>mj1pPFE#MYmHdA^VwZW#gnBm6e#R{6jsV}==m=7{3@bLQ0M?MNYtDMTm;DtaULVj1eB RiXcK&6mi5%<=Jwt@JgVBQ%rl6%?{IE(DWyIwX_EI^2^?5hAk+Jk}YrKwKmNvmRIe1hYU~I0LM(BXj@& delta 583 zcmaJ;(MkeQ5S`7X2m~qJBBNZS7l|xNax;WXOdm=k1u=pU-O94H%*uWu(0Pl#A&P~d zm;R*Z-g*onh|b-$h>*Ap+|Eo(ek=pRZ66SPO` zU>U+Nn{tvhhf|CewYy}YSF&nR4Nc)f_?tth-P|{BJIO(*$uG-3vm?I+`O!5pA$B0z z+mhlgBuaDz0|vL;vu*zr8y=4t3&pZ|=ly&l(g{6-%C4;S%tshGRwErt?o)!X<+01>)zFzrx NTA)P=BQ!9hjxU2he+>Wt diff --git a/PROMS/Formats/fmtall/GENSAM2all.xml b/PROMS/Formats/fmtall/GENSAM2all.xml index 1b7a93a9263e0e57167d8ff184a2b5776da53ffd..ed8a7a97a87c374c2db62abb84fda2498a63b721 100644 GIT binary patch delta 159 zcmaF!it*TE#tl!HCW|qPOb%g=o9xHJHTfO$s>xnbT$6XP6irTGy)!w2En@N~Hj~YZ z*tx_e&(Y`D{7#mMdGZ4jw#^2LOmdU!B$OuKQxTe+Ai=SDf_)0xvj?_N?R?r) zOqXbeieTGMzE4FuZi2H;4l34_=4E4LD#Dh~t&RG7=-|;q^qmEZ3-m6q1=ZcBfRBO{ zzcPxvmOR<`+mWdAB6_r-#>W@L4#>$1SlKw%$0PP8GPfz@T-g#mV<^oB=ZDQ0Bq>b_ zljHuD$={|jhhv)lADKBj#iO+`erM;oXO4(l)}d)hx23{JvD{0AE!x4P0X%z}FY(^U zS^ioc=ImTr?3N2BoG7`Di}g{^QI@I8k4GCE@7ts-;AhSRzi>uR{fRbaO#bA&cK#s? z_FaX*7Cks7d`bBuACr`RLA^l<)(Yx&$=LW^6X_|`2`Jr2b!zDcT%W;yfiHqxLZ6Hx0B5H4}YQF$6U&0Fj diff --git a/PROMS/Formats/fmtall/GENSAMall.xml b/PROMS/Formats/fmtall/GENSAMall.xml index 406781121a4dacb27dbcd139d0a5f1e5d91265dc..8d145328d34291966f407be253c76fd03cf21994 100644 GIT binary patch delta 240 zcmbQ#%KYay(*_>a$#$$FlWSPxCZ96nn=HllVse%w*JKrTfyou@Nt5|F-c6R^jF`NM z(`0iJ*Avmr4GMRdCciQknCu|0GucK=X!08oj?HhBIix4+Nh@u(uvcK6e8fd+a-Iv< zlz=B3@0nD3cc-k>ep5dvoS-|^}%jRb*RTwubOw?h6u>zPU=Y)%F{xy3a)8?@K zYZxa71aM5=Fi~amss${pKt=x;Cx6%@H<@dL(qw^!N}F|7Ok)I!zF~&w7g_&;X|vcS f36{yvR$kjIx4nZI#F#9%yY(!Jid=}bLg(jw{i%QL}?V@dhiF6@;Lh_8QHO=Qms|y!G zMMVWWuB4zKZd{0A7P@ew(2YA+?u3YlC@v~41TA=GCKar&bTN;ad(OFY?!EJV|FSPG zIG%NAT}dj?G?|p39KJd7QIaNT4pD(ba@2g;5pcqnw29qAV%M-#+fO@x|Nw zb-yK!A%^k12568Xiu>VSK)1{lQh3kO3vG{8t`LPN435Lj-#_|k^ICHT@$*Gm%oT@a zq5)VEiD3NGlh1ZbGyMwx{`AL2c(ak;vVpYOIBw(jpYL^8;_7PFvveJ=%gHalylVRc D%W4Uj diff --git a/PROMS/Formats/fmtall/GENall.xml b/PROMS/Formats/fmtall/GENall.xml index 05f8bbaf7fe01da21ab4cdeb688edd76b255dd3d..eba2b47fa0d4c2fc51fd2c70e340578e3197e15a 100644 GIT binary patch delta 299 zcmbPsfoa(hrUgus4XjxvTQLbu<}%>h+`}ZsviS)c3(w>_Cbr2u!kZ?CBr8pd(3(6e zMQU@7NDI^C396=388wqX zNcv6gv*g?Cpb*B4F0uKE3J*jOWUfN0*krvRfz5X`Vwg8i(2-%Bd{0bha)PbPWH~8? z%{6)@Y^Y8!HR0PF;PQnLs3Z+&g}`PW_c#_Hr(m;=&jfCe^EX8-dikilhNU2g=Vx?#jx?)9=&@@S7F-;&1)`AC> z_96;xhl&&r>%~97_Xl|CO%R3N6a+8cN{=EG{C1NH!fKagcjwLfzWHY6&3n5gzx*T{ zGOwzKrC}cMdfVc3ld4ppB3&kppR9S=Be$PaDFJUC-UYe^>l$8jUD@~Y+Hkkfn zzk|ETZ6`}nP6XIWiQ=@84A&O=Qv z2Qy#B><{6OjKiTmB?8$q=Y2`shJtl76A)jtWCz5z^^hbAFCM#X_aoTfbM@L$2PsU0 obde$ywt~ESwIv7bfB;aGE{XS>F2zEevKS6{@##&fO z`~h2Q3$e3x-b{U!$Ykcdx$oTb&bjwKTsTgz9aql|e-s9mk;fP^{AQpbiYaU`I*%Y) zWGn2IXGc}DhB%{nMt6|nZk(_B&wWJYu%pQ=an?9HlY}OaCapoh5@t!e&csosPB6O2 z*fe9?jOC;`?2`u9%iM1v5mK))dlp#>OEftQtSDg^LKphDYOrz1A2@~RL7;#NNbjUi zo>DG33A*IgSuUmS%61Jg>RM->vb9NV2Jf-iRQ>?^?K|Yo<30Wh8$t!jQTFZ8=`l~1 zWolhSh&N2}iL$&gYEN;eu{P6Olh%KNtHxb~XEC0{sYXY45esjTdryV0`!B^(JzQr7 z+>Ow?V_}OVFxejc1$(`<9zt(?4_Weg}5mm&gDB diff --git a/PROMS/Formats/fmtall/GPCAall.xml b/PROMS/Formats/fmtall/GPCAall.xml index 1aa996a1f3279081f7ae69c7dcf68c0dc8db099b..feec0712c9c84805ceb3980671515a7b71b501cd 100644 GIT binary patch delta 278 zcmXwwF-QVo7>4iv@09#A_=zBCkn1|_I1Y!9a4C+a<`PdL2&+LfoE&O(b_m|3NebZ_ z0ujDw2$373qM|{9wnnFDkei}|YI>gMh4<~9j~;mci^1eKNUCL&rzDNlI}NrgrZE`v8IENd=fyZRO*7T7n5K7A$UtuH9O*#ObuWZDBIn+I7l; z0{;QJqa?<_2mNSBiZ?Mx0zp5alKA5Tn)pfo0Hb_`7@u=*S7|H>=FQu__uS{4^W1Zu zdv1T{`Q=wn?T*Dig&woxl%NvjD9_=vpZ~P33_COnOO^7pN*R0|!Yk`y!}=@@!kVQO z&W`NhZf`qZ^&C2LkdDDtq@(am(;A(?lcfr+V^ziP3hd%Jf!BepjI~S45{K^hJ)pe= z>Ch?cOw$YW8Xce*&BG#$j>EG^?`lMtrsz@fkZJjVe`!sY$ zjtR#qf=T%AgAM{png!6z!Y7U26Trl9^f=JVROR2M`aka+v;r}#-$2w^N`h1gq$S2U z_u8+H8tVe^IYd9!6lWUNqp+p)v5=oHf83+a+D}^pQiCjNkk>V?=(?w|a`7egJEA`H zMRl7{T*;WmdxGCdyCdDf4SH*WR#qwx4^%mH6>%EJ}&A*;j_gM*A}1b z*c>9?EdG2@=BQj<<1gQGP8SW3sVP@iCZCJx){I!d@W3E~=ODj18dP7ua=mT)G?r$r z)NeHpxB<11{lNO~mKtyu%&;*7w*XIw1d3QgyQK7Tg;#kr_ynKK?HU$)8IO=%#S;U) z9JE)|{T8x~2C0v7(VhMzWR$~Z3F6Mzhwg;Bc0OdOrH#`bRX%siY6*()wevgG()+nB zEw?8Tq8pJrcDP3dpo%CyZo8y+KFmC=ZU5*99@|$~&3Bt-*cnQQ3W7*udqK*Xs Dcq3%@ delta 1583 zcmbVMOHWf#5T08Q!^1?xrfS7r(5eN5LW_U`S`h^wl+tR^7@^Xu)CUC$DsjVtr7@C` zg(Swrm2rc~abaATxG_c(qi#%0O#A^R7+0>;Z|*I~qlscpdV9{yocX?ao!4({H$T}P zf7hI?6sH7@&_Rmf8zY@s={O}JHF)-zoxf>MOLXdhWP}V#Q3Sg~_{n)-PRg^vV)evU zknL%qemEJR3os7TC|$vd(J+nSG=lGC$eXB?s(EOt$hXk?fN3W>oo-MIwb5bfp#v14 zE=UCS67CN0P}HH`#jlrrdA!S# zMiF!zjQYVV295@BQou}rc|UcUTm>K$D1RWfAKFfj{0XZAIEw1&2b#yrE#j4xQS~R7w&JMBN6|;RT`j z$tUPMxz%2r$#OpVJlP%O+l}kkdutoNb>xTUM_&7eBPE(ZOI46)-bus=n0jSL=2E zs@yJEpOaghaF_GA=ankk-k7ymtj0axbTw2^}QrSyu_8}^n z?oxIg_3<}%0ekEH+8HBQq=@@akR`RIzuWg!c9x5L5KA(LYGXJCVBL;y1Tx8-1S$JbwIlYq z(jG)(#34wc`;GKFR;>b49!>3>+>-6cr1wz`EPiFVGAaGkK-E->hsbNWiBEs9IWt+- X;mOzytLl5s?2J4F1v~~HoX+|U6`WW3 diff --git a/PROMS/Formats/fmtall/GinnaAOPBck_00all.xml b/PROMS/Formats/fmtall/GinnaAOPBck_00all.xml index d419882e4c754caa021e5201d699085b3f5e0179..8dba0f710cd7060d3a9bdab9ab0e98297414841d 100644 GIT binary patch delta 163 zcmV;U09^mNx&geg0k8%GlQ;tqlNv4#v&;k10+Y-Y3X>2m29tmb4zv6Q5CM};2zHYO z3A~du3P_VsEDn<}3-R RlMELkv-nI94YMLz7z2-#I0*m% delta 965 zcmbVLO=}ZT6upzt%rvxxH2BfPB$G%e!4}hk3n79{7}H3bmZoVHN+FpHO)(!bCKde$ zy6EQaq-b_-EzecyMz^B4aODs15BLW>?@bh1q@aso-aGG}^X@(O-IF8j_*i=v)Ojj3 zHDS{V^{7cM-Jvx93|x0CDpHH;)TLdZRqE3-YGZW|aUR*UkF^J^iob)?J>Xr*rVZc& zplPzG0<@3y6QDiCmHV!b@{tkY*XFoL>)!&?7S#~uB9Q?ul7h?ly5#Z=bDF=Dud#JC z$OmH~ZjVihbTFXZT!;QDZ6T})LJPUnsRM~c2rU8K1-1sv1J}o z0}h)Jer24*tMnLG?m0(z#{2F+YRZqsUqg0^WK<={k8qTC&-f0KeHXj-msmwT> zP4d@}Dc+lv$(16AZKUfP=c%NX-IP;S*%0&%cOcvRlS&1CbYPtaen%zc(msdF8Qw`I z`1xi?0&2&sAVnWK7dghu)d)l zO$inC(Ucmjokw3$0lqeWF2~W;DBsOkqL5mT%}J`?0l(}9!o1O&``yvg^xve>*5n8FK9d~+TsF`1HDkmkx!ED$ z3iIS0Dsq$cLf9s+2{`~%B(wQkXp!FLZ9OWCo9kM4F+o@rol49=mI(`lt25~aRKjE0 L2`DRK))z(q1Ylrd delta 1334 zcmbtUO-~b16umQ0KrM-Zj0$xqt-)xtQoid#4UkqG=m*dQ7bIFs18OM^lqxGA8bgGI zc#Uh=xHB=njWH&KoiUoYaAn;1AN&EH_g-tF8KVh{X=m;`=iGbG+&hn6njhbouf{wa z9BDcfr8q6n4CVOysKt(_DbP*{L`sySB}(HihD$yds!`td+C1m^Qb86d3jS>%GIWdb z;7uxak(PMdvV~K3!nCANktXnak1kP=dMQFdaiif=jWr1N9ULVnNy7l-C4f7;=Q`8S zx(}_iQkTjayNt?8G>_*3{-sr zT6}Y(fv3k0+exU!fLK)OL#QKz$XyyktibzrbG=05X@!&CmQ|TG4eT;>f}}kwXe>B6 zWUsoA0A?P}(_5meZWUTI@QThA3R?H~t&% z^YHbntwxvwmann8j_RFr+&+bP-1h$w4<$mpQ(xxKZC=^MuzP70uhirWp|~uD`*$~| zFeq~Qu?D>B_{F=_;sq;-J(*Eoj|2|%$`6S3&9jD>SbJ+8cRTN)ZjA^(4A!_J`l(kV t${R;(THG|csGB0d7_~n4<1hdfkrz+in|?P`A2y{A-=|;co<93w`~(WnAuRv^ diff --git a/PROMS/Formats/fmtall/GinnaAttall.xml b/PROMS/Formats/fmtall/GinnaAttall.xml index 0d20f16016d0e9822e5a569e9f1e059e6d6e7851..f08353edf106affa23197b59db7669d69b50ec15 100644 GIT binary patch delta 148 zcmX?dpRwmEkV)vNb#jY@k%Wv~Ct_d=e!;JMNUyx_nJVAYhGKevGf_lT|d)_nH zCqD|7n%oo2HJLBu4p`!Vq}=2dW2Ma{p(@Oq*G2U3Z4OC4#R4Q$7&ph{W-tK&_SiRp delta 840 zcmb_a&r2Io5T4!mHkVSOvZ7HjCJhoaF|iRvDm7}X2b&Fv;=zN)WJ&tNRpM6LQ}NJS zp@xC>A85gYhnBsHQ1I@l=i;ICD0uMf_jYrtMG-vg+cz`c%=f*S`S?pY`K^4n)$S}+ z=mps{OC_8o3Q?Ax(Q0q3rpnWk|HJ70XPh<=JwoMWQz=>nw4;tLRG zp_oi6!Y+Z_c5fz%NaDvxPvak=8DL%`1}`s(s7TW&jq!W2%3npN?ny2{p3y`~+&Q9` zBG6kzX=6Avoyat393hhACe=U)3L2ik&sJUrnXKKtzFp-7O|3@vhFZMR60Cyf|S8$o}Q zkynhrGq(_8?9-qw)2n|ZEn|RkuT57})T!j>e68~^z1i9xrSq-Wc&Hm#n~J+)IRLz^ V9C1?Xr!D^tB@v1#&ZAmQy#jB}xYhsw diff --git a/PROMS/Formats/fmtall/GinnaFSGPEall.xml b/PROMS/Formats/fmtall/GinnaFSGPEall.xml index 9d6b71f32e180f9252aa33d46bbf2c4bb7a4705d..78860b4e3e50a65b6a9b0b2cb859283a83ae8554 100644 GIT binary patch delta 97 zcmV-n0G|Kqt^ug20k8rClfVN6lQ;tqlX3%IlWYVElMDo^lUybWlh_1ulYRxlle7j9 zlWYb^llBHQv!(}a?oo&c8tlV4d#}CL-s?0TOkYo?=MIT|g!+17v_kt-B$a~XWNFF9 z%#vj+irgyIs7g_s$A~a6J9I>K(h$IsANYPLKkA?)&>9%(w1(Rfg1@WnEc49R*`?I5 z^6CL)aGn?p0h$AcTfXooC~q()sEj_<;K_m`4`q$`O+_bHokC9lU3c=kRm_xueu^Ss ztr$DxlpHH57H<~ad*};;IS$?}+Qv?tQH6$Pu$Azxpsuo4WuD#0-Q1Iq;L1X`V4yi( zXz>Yr2uG{d&Wjn=zd;_i=hJ644 diff --git a/PROMS/Formats/fmtall/GinnaFSGall.xml b/PROMS/Formats/fmtall/GinnaFSGall.xml index 1ed1097a7180201900440243c6a3b3cb9cc03813..b94e7bb718182d4d3ae874800a5d0fc54b49840f 100644 GIT binary patch delta 124 zcmeDB$T;OSwN0T$62BiY7l|SvQ%5ODr6%ul;+pK>d{fgg&&|Sm9jJ@02N>{H~;_u delta 702 zcmah{yG{a85FM5!G$ulU29@woVkk7c1T9SD843gfB$R}(iwd$DSRYjOTA6F*7uX5e z#!s-ew^b7p6XFke?yfY7vDllLd(Sy@W@c~RO_yWSuq8M%B+&t>l%@vG26-q$yL3bn zo3+g|NtjzrBP&sl6kvLEiZ209n@*??MxVCHM z=3+0xorAv~QyJ%(t`Mb7Xk3{uLV390%6a%wpu~|CK7>m#vw( K4UzSJOZWoK*qDI; diff --git a/PROMS/Formats/fmtall/GinnaFSGbck_00all.xml b/PROMS/Formats/fmtall/GinnaFSGbck_00all.xml index da8479f98d9905729e98127e91cb0ce979df7f41..9a5c447a18c930e165e063ea5d1816797236eafa 100644 GIT binary patch delta 173 zcmX@LiSf)z#tlVGlb0|FOpdbQ+ibx+iE(nAAkX9t;w+n`SmhWeSFx2%He%m1If27t z^8pS$-pRi_gf=IL{bHJY$0lL(Ey;OIAd$%zYtOO{)IN3~IVDdaK zj>#X41U8>h@R6EqAPW)Dvk=?dWF5u=S0UhVYw|TWrOi5yNvuGI%49Y7JCkpTC~eO2 Mn83SPB+QH%00VMBq5uE@ delta 887 zcma)4O-~b16ur~Vl#p0sLJOrWGAS`BiKZd}O@u|Kf{9i9{YzG`$j0>Z2 z!ivSrym#iDckey#e0{5Zd9Uqzfy4|| zX@i<{i^_PH$)p*&Lz_Sy&W=Z)P0+pe>Y^Zpo<~?B>yc^v9(pha-v6(I7rPWxqdb;Ci!T}?(*l*N{JWK zw(%btQ7+)d{TzDg-W}x9&$-OiRsL>`@}U*)>7e|_`kC`Pa(owIv8OUyL6T+GWo9j` lD)itKV-@+4nLw_^kKBiFbPAFE@=#P0IV;9rjJ)9?TQ diff --git a/PROMS/Formats/fmtall/GinnaFSGbckall.xml b/PROMS/Formats/fmtall/GinnaFSGbckall.xml index 310d13f442caca86901e20ed7dc8ec66bd4b48c4..cc5dc3572cadcb29098f7490efbb76fb0fdd1910 100644 GIT binary patch delta 242 zcmcb&lWE2}rVR;f>;Vi#4EYSnlNF`JCqH7lH2F;!$K($ZY?A||I41vMm)NYuaf*4e z0FTP#3?7ro2YBCX*5G$yoBT*NVw2bs_Q@+mBQ{&ftzrf&l%Vw-K8yqG2@*m-PLaP4B6{K3dza)J;GP*!5HgR;VAJC7i2f-;Po9egG* zPyXX6H#sTb(c}hUmCfq{^Nco|wftcQ5-NC(&QLrG0 zh+^a-xDZ5tKoQDAA+5x1qusJ3H4j;XMmZ8B_*IGD??FKVb3v;a{={R*8i5vPd(p8Yp^c|-69y4 z`J48dzU6=@sxGB7rdP6xn5w{xS^K8n4Tt$b)X&R?OWfNw>>5mfJfRFJ+BBC$f*CX^ zXQ)J1RhtcS#JbP1_222d?i=M!JtZasW6uAR5uJLIOP6CTi!|Ml@6wGTEve>0e7-9v zQem(EaJ%gXH0jm=rB$~js^Bbius6I<+#Wiu@$67r@Q-=;N>^FziQm=2_ONLbQ--!2 z)xnDx4|&1hG@#rA;z_#N)0)L`8CSPQ1_ASw9~F*U2OT1^{9fB_7w@GW zAf~q129HpmNw43DIQ@3?Zt9@{h2geEAD>u$C06bq(gOC_7|;#H@Ac1`Zini}S?R~s Lw2|BO$fx}P`79>P diff --git a/PROMS/Formats/fmtall/GinnaSAMGbck_00all.xml b/PROMS/Formats/fmtall/GinnaSAMGbck_00all.xml index 4179eb50b6b8eb0ecb68c1e685bda7b430fe9e1e..188a1213008f69cba89f83ea689b39bc99a8caf0 100644 GIT binary patch delta 173 zcmX@NiSfcp#tlVGlb0|FOpdbQ+ibx+iE(nAAkX9t;w+n`SmhWeSFx2%He%m1If27t z^8pS$-pRi_gf=IL{bHJY$0lL(Ey;OIAd$%zYtOO{)IN3~IVDdaK zj>#X41U8>h@R6EqAPW)Dvk=?dWF5u=S0UhVYw|TWrOi5yNvuGI%49Y7JCkpTC~eO2 Mn8LeRBFu~#00{a(vH$=8 delta 921 zcmb7DO=}ZT6upzoq!i4mNt-6A9aDr9l=K6uV7th~)Cx6iO=5LZ$V`T&m`v-KR9uMS z%2mN$-MV)p#kUZ_wYU=f1x65Dxp!mnyf^8WyDnzty)*aRkMqv^`bPWmPTTWCsUp>B zgW7bBYIxVkq$1s}{-lU}bzA z{M`WV(Hv!{0=xq>gDNGUZLA*v-Bet;_YP4RKTkEjoQ{i~&`T|6QWe22n(LsPOuLB3 z19GxZMUB(s$FcKbMo((FTd1`}tAOjEH4t8-7HD~-TL8KaY#Epj%%e8HUpdEXMuVRl z7s69?hrd|^{K@z@Ql>2wmRiY~UF>ckUaBKm(O7EyprJh3m_zDN#Xl&Cm=jI%{m9)u zlT>G%OOJ9lr*pSo7u`rAY7{_j@^343u?Tt~wSy$}!@?zK(1JYjU|OmLm$qf2;?KaD zFft#c7#8}_e(3ah_;c#5*h?m~(^Cbg+NgzJSo$*T}V=_2UG#JcQiUoe^oluXE*u69;5?5~P$7f`HXojC=v%3p}Y@SW?{;YkZA^)^8 z;@O;S96@7B9e5&es;`{k!nwgskj|Un@76e|$-W-Sf307Ipd&X>7t;I6)egKaZ-aET ng_T41{)z;t61(}pCr$y3+_CRZu(O@6|5X|jwJ-{b@lj>&)6B{u7DoMN6V#G^7fi^pX0 zAzr!32^@Tr8~6@v-ox+2HhF-xN%Kxuov6B&e@A;lC{U?Np72%CQHeh zY+m5m1!IITZocI^fqC*YF}cYX0@)^i)7O|>5I1RZf;bOIFHpJ6W`|%Nlg(-Ef0%)U u3gcwA6rsrvX71RW(_6s=7TK&aQ4cB?)&P-5EB5nv}#ZQ delta 1510 zcmbtUO-vI}5FWPL5{o~DfVS8yt>GYu{1vHDqot)1(-vYk;e>H%8$jBEP*6-1LiEA` zjgx5N!RX1O%DWj4#-mX~j0dh>^kVejS>yM1yP&wn7}9k2?aX}N%=>2ETU$|$N5=X0)Lt>l@cvv^*Tc_~C;3W}?)H;&o}z!%_3 zQ9nfykT(j8x|>@yP+bO5CZnYnx{D~xV`h6 zeWn~Havbs5btzK77a&g#OcIr%R_sRd{fUX9f*DjVJ+cjd#qvY9%Ac=S?zRNiXbv*x zIFL{|rdHe7>pfPpWZUHqOK4Jn-?^U;m4HnnUj|vNsExrfdy_^)2FM(K#d1I7e%g$^ zm_EyH_M+TH4xCoSa#fGByBEMwL*xudHcJ!-`2?hr<>hF0Lw^41(?wIwYu6SCzVU3_ zx2}M!JA}%^92oNR{fFiN-3zd@-)N$|8#I>eKChd5q+iOdaJ~ z=FgyGm^Y3j8^znkDsM}J?Z}v5Yk(7mGC9iQB&xhxw}V&r)QQTIXB4^kN2U)oBjR3U zMQOAzsDN@tz%P%MjvGQvs{G2kPb|ci{vV=Mh}(U)9FWAvrxH%Q>vmd`WlRlZI$(Iv z7fUWamiQF4FRrYXF>5_2FN1UXyPks>EqUSLtO_;R9IEZdVa*!%SPDk-_URUp8wV>y zadA!AYv=Ez4n&M^vvnS!kO^O1I_&V;!P}{W!bS{hSE_ko@tOE?vq`D9k8MMAnejM( UR8+gDE=*|`uFUn^@w?T^PbU&hv;Y7A diff --git a/PROMS/Formats/fmtall/HLPDEVall.xml b/PROMS/Formats/fmtall/HLPDEVall.xml index 3779aa7e1b53b1f476ba60d5145ec6e3cff0e948..a5d31f2b65e98a08386e62ba9f3dd18df6b8966d 100644 GIT binary patch delta 118 zcmX?eg=yD0rVUX{lY5x9Z7yMUVw@~v!8Q2?OWWiU)_IfL*aRlqv3X2B!S-Ua0Y{t8 zz?VZV4VoIAU?1aKMZ(F9qxcS7iTTBqvlUZWS5SHD1HYlrS Ku>goQjTr!9(=ns~ delta 704 zcmaJ;O-lk%6upjG+gyxMW|=!7X`K8BtA&}-Mki7*f);~H-xfBM(I03P#B&j}3F-#~ zvnX1$ZV|1DLa426qiu`Mo2Q!^VwlH!=bU@)dH3BuN)J!c)sp1PP?^@qpc&G!>J*?1 zWoa8|g`LD?wkX{U2Pg-`pbG6$0lQiJ{9NsztQGN_1J1ZZ=JXCNVBM!F3R0BDDabSz z^JHOO2a_YsVpR6#y68=z(Rv$AqiWOQ6n5xd4hwA&@ycknN_jYJAw&u>=76pMn+H|{ zR%JSq*{l0QH_$&1q=cHkmlHkmP?W4XRKkyE;Az7Y;dwCx!FM>3qyX1C8O$U5&AYCn z5q3Q2_48Tq0K%B>xlxG@5Uk2RC$G)-vG1<5pf%cqw1$u0sUq%b^|R+Y`MIUSo|7Tg zO!jxTQTCN=rT=YjIZq=4=I|0+cEw39@nj1CDoBZ^8WhYBJJOt&%zDUgVehK6v6=B9%$_!}A= zqDe&h;r_;>!68IyaR`TKa105NXoyZdm$sLe?|HuW>sG95V)+`d0y--Riw;b6l-WtDD&k$nkMWEhUos60E)dir<4ity zCaj%}0=BaX%O0gE*WI9i4p0>Pk#~mSYLE>lyb0YtKzPRsgz$O@56K7p5+1Avk5lj~bVYt*H74^j$hkQfu~{x@*>Z8y nMS4RN;ASg{J>G_DdzSjcAkmw3XjqhKsB&}M%0T(O4SC@YKBbhG delta 1581 zcmaJ=OHUI~6h5~UVtBN)Pzfl~l7In0+5)BE18P&mq(UjLg@{2~3JR5!hmVbts4+1y z#7mrwG5!Hf$t0E#7c6vRFk!{QxM1f(Od3}vqVc;kQw=zpW}2CEzVn^$eD~a~rR=Xy zvy;n=8$8y60G+366rm`cqDslaSP@@luN-#jMtBb4S?b4ICm!(~&qVo(xm+GJ)aGaV zX@X*WrNCzHqy*B_6ae2O&2dL_QN;v}q9_KUGk8lVWMPo^P#anau~fD@chVKLAq#z~2^Ls#jw}XcmFC2~dureUyAq-Gyijv5?X> zN^$Pkwej`uChoSZSM{OUln{v;G35-MgUk>F#{b0l!;wy)Eap)IKeOQSw zxGH$kSuL*)*cnf^9V{11C2Ua#6YpZ2F}ewjalRNTkv9hq=lIohkK%FyAaUBty6*91 ze_mTc)j$4exQ6cxmtozN)zqRFFVypyiN`$Y&KH9G{}rU1fmq@(y1GyD5cW*$QWSgn zrM5~ojl45jy6~y4pmvBnFH$4#UM^;Tr{uiIJ;~OCC5k9Fq#L#BJ#eKK9ju1&`!TCz zcd<43&W~-QLl+4<#I0$j7V>CSo#|pJ9bm6h{YJKCEYT}#B)1AqxpUbEgD%EHO&Z2& zV&4oEdOU8lb&>~`dGI*mc}_=#(o;g^*Awy z7@WKs^1%@xb-Oo#u~oIG!l-My=7@xD>D2QMX3gTyHaeu7V{BEow+E&-;|6NBOUZV& zk$PFrPU>6b0#sPg^4ofoixp?-O3{p$fcPWjxU|s9woCPFaKQ#|s<(}u&>t;xkdSyF OTeoB8_&x^MEyFKXvtM-p diff --git a/PROMS/Formats/fmtall/IP2BCKall.xml b/PROMS/Formats/fmtall/IP2BCKall.xml index dd5d966ef3c2623cf44ae5ae77a91339ebd16a0c..ae3be1e04bf97308087e4ac16bdf1047001898a4 100644 GIT binary patch delta 268 zcmZo@W&ZY+X@e8{=0&WV+p+!y<7vYesH=6i8QPMeplRAJogw@8E;!dkTK1rw0P!vf)cS@#UYRbiZb nrBi5f!lE6U_pLW!oUE|*4@5p~`xl7(<{7)~phk!s$YBBi(VTFL delta 1627 zcmbVMT}YEr7=E`I{%t1OGM)KLq~vh^EEQ7HrG)6FPFh5SbJMw;pJP8(&_y>%MP1}e z5EO)X5!6M-Cv@9=5P2V15aLyklowq@&pBt)r0+)g_zvg1=Xu}vdH>GNFY}$dmesyo z-X1N<@26p!r!Yf_boVBc!zq(KIwcOiL z4{=>o@vfHAD703VTDa2#1zfptYxURlAAjCjkU|E>;#|@#@!641SPT; zIu{|0KsF-N0d0P}V&^}vig?F*i5HqmxW?93FH&?XlkOdby+{b(fW^^vJ~W@|Ef(M-D$IEa(u8m-?se zhGe0HXTeG|)ENE+a1)&Nnqhs^p>Gyd7CQUkS@l~8!0>JdD1`wSnunrr12cToR>sfW zm0a9l)m;^9`G-^2iyIbA`omL`=0odG6!6F9;|?)bf|<&v*ozQDC})scy6n8_%vo~e z>G9S@+X3)gWz8Lp(J9eMe_&sbzkj4z_TX3$N$CRQK9-! zQ&HuFoR=vXwrU&W`|P00_TutDBUc3~Z2P4f15O^%mQ>QJJjOA|+#&)o3gUGN;l0_P z{Q&w&yeSwL-e@|_-lsaFGB2 diff --git a/PROMS/Formats/fmtall/IP2DEVall.xml b/PROMS/Formats/fmtall/IP2DEVall.xml index 0424ef0cc17e12a790fbc6f8a638a571f9fcea84..12965ae9df91cb0ab3ab65d4329a95b7e7351d95 100644 GIT binary patch delta 106 zcmaEIn(^3C#tpX^C-X2BO@770H+dgZ)#NnhZIky1aZR>kX`6hDW!~f|tPz{_*n${0 z|6$*xvPpLe`y^AT$*WAbChM49*z9ChC%0K3N`-OrztB(2K-M=90p$9{e_?{K8j@3( E01@9Qng9R* delta 684 zcmaJ;JxgOj6g@8=f@rZTJS{@hytN4;gctFnP>Dg=#zc}p0xBAlhwG|Q^!WugR{nrn z*$INxvh4D#MT@nuax2lo#$RA<;h8szAW?=HX3jnL+;i_-{xcq~j6b)ASh1GIF-%|; zRX8%+W6F);#yXK9;=;iO3cQVTt9R`cmECYuN`bw28b44bzCdmsn^@s0V;#GExjdJN z55YpOTsN8W5I8ZF-WqZ|w{-*qu;d^pUniKk!$<~MKVpj+I&MqR+0Pd=&8%fVmJlyA z)1$dXERy5WNuCNTteB$j??e}fP5OQu)a0UQdSAjhLw*OFRpTRCF3+?IEjwH_rmAwv za)P__CH9Kzf(0^n;L3e-)SGKK?UL!%)`*&s649dSu0$%FL0M8!Q_lNBa@Ka_{px;d z2>T@YYe&9mdKOzuUFTA*I2hx($d-H`a%{(AZ%ux{l?(eW{fPI4W3rXS2vb zsd^49?=ZRFZe}^>s{i*Hg8HZWz1URT@P_k`!ARXWk{E=oS%uR7Ku0~64V$ba`q4*b OG*q`#LW|7LRRhnv&6d0X diff --git a/PROMS/Formats/fmtall/IP2_00all.xml b/PROMS/Formats/fmtall/IP2_00all.xml index 57af057387a9f0892ccbb22993175917121ee1a4..3b03c532c89c8367946f40125d6b383d736651c6 100644 GIT binary patch delta 133 zcmZqr!uaSdzqTN!w&IQ>n=hOt>Z|ncmslW)`KnStVD6akE_F0#+c4gK6`F3kl(T QBBdw@#04t(SI)u&0PoQ=9smFU delta 649 zcmb7By-LGS7(Gc_99%7eRhqVo6@~oZ-yov3;$kZ*bh1#I*h*uBSQODg9DITM0^;Q0 zV95)J_yCSBiiqOm=HMcFlIS2*p0cHdYzUbNm0!4=U~=1ENPRq;jZJ!$FPQSw=2a$lHS*s=*Mc zp}6PDWocxYqD7QwZjw?bv4Ty~W@xfNv_@NE>bkMwMCo6e} z<&#+3`?26&*o`M|a9xQe+iB<+$0#Pa)KJZC+{%geObr@zvi4(tNa>h_LBY`2yKhG2 EFW(xKCjbBd diff --git a/PROMS/Formats/fmtall/IP2_01all.xml b/PROMS/Formats/fmtall/IP2_01all.xml index 163df4cc09137922cd80113e57bb42edd4185ecd..4a00ee5061bf919103d8385e9a6eb2651cc74bba 100644 GIT binary patch delta 131 zcmeA=#JFTPs{jB1 delta 637 zcmZ3oo3ZN< z5I+wlI(a6G>}C(9B1S=9hD3%6h9IB@e+F9yB?hC(TbZxxLiphfnLuMp7%~`wfvR$W z#yJ8F^Z<&c1H}S>Vnsl)yvY+CMOA|t3K(*LG9^H@Ad3qaJb~5)09E86#3noH2ygCT z@zWE88R!F4S_Z^9lX;nBCl@HnOlC5UnarmnCJS;i$arTUodafroR`c{3A7eyrM3R# z12%k<6-2c*FEd`oG`WD8V{(I}lstBAPCz3Pfts@?Cu+M+t}~08e8GkTWDP;}jJ)EL z6ZE7e+gTi$yv;n1RDGN6EIb%l!G4(BZz-(|@r^&&&qYB0fdV*{!4*h?f)3fsrP!gOljmFBb|v5~pgsi#Cx{o(LM$8@RUord8I(4cTRmmr_5d;=F<3Hrx`X=W k3VSU^WWmkT9Ue-G`U68O1)O;Nfa=S^PBYtF9A(H103r94NB{r; diff --git a/PROMS/Formats/fmtall/IP2_02all.xml b/PROMS/Formats/fmtall/IP2_02all.xml index 29d53ada6d28fc4e990804131f1ddb7c1d488f7a..c709971a6560f783b4308024af78ccc7c5b12c15 100644 GIT binary patch delta 154 zcmdn=jPck##tm;6C(AK~Os+EL+q{XXfN?S(3)^HnmNT1MSetAoztNMLtl*+Cd4lti z$qJHQn?Ja)F#{PMlY6{WHgEH=VgzwE_jrjgff+Wwrx+&}`Abcf@#mU6&;QP32V0iS z#{%xLOil||*?cdwh;egT_%uckZ}Pp+cav43$~GT}dL^*=NVXUYkWgXVtW+q#1OVPT BJNp0t delta 851 zcmb7CO-ox*5S^Q3QAz`*k_rV$6p>~jgjkV4MNCMDk}rG-*_8wntN2Wx&sb~eMi3O- zh_e*Ll}icUm4CpWpgXmTx)LM(1wHr1grEVD$K}nPIcLtyojJb}r?;YhC-^k|-W{V9 zeWx;2Xo3d$kE54^4i`U&?0}!rh|~~Sr5vm{j=EP{UKWvlnRM8~lcEy+q*)L$Dh-AB z%y~J|yccK@>1(t=22jgLH-&@=c)!7yh0lhs%991}s6iH)h}3{p!WK1JD z;F-u%k-M(#iLk$&JPFzl98(vP19c6zK~e~naEj)2Y8zIJX4w<)?T@_Wn=haEu_fk5R@D{7-_*8JoudutR(W&G$Hn1Ajv_;dd!3 z_Cn)YCDMF^CvRE6^py&RBR5iiU7iHY=2Enz8%BUn^7m{RThF7iVH}9(ZU#x7#oP8+YAWlU;O9rb&H2+9A6k;2*|MW EKOp_ZK>z>% diff --git a/PROMS/Formats/fmtall/IP2_03all.xml b/PROMS/Formats/fmtall/IP2_03all.xml index c5c8c9240699691cca8c00332c686e997422ddf5..89c2f6673c2a98c852ae08f84126844641158cd2 100644 GIT binary patch delta 136 zcmcb1oN>tk#ti~Ylbx7CCigLOO;+Gy*?f(ufN^pR%cadLSpD=S7wGa$E>Mt~oMsX; zIYG{2bByUSrpfcfO(u6)L`=RQrZ#z}SI@SwvZ4 i@(Y_Cn_t*IV%hw_$&GQcjmx3UDy|D8H{XlkyJS>|Zx#o7w@Wg}i?)(8fpp+!n zJDxmQyzqo4e}?k8-&wKL^6mRo)=GsBO*Qlm)GoX)b^EBC1M zpZEj!8#_IFf!wR!9{VVCKf3=9_^Q{ixq56@U*-0dT2UJPmg$Kl`5p a*7yAPxBYwI;;2q diff --git a/PROMS/Formats/fmtall/IP2_04all.xml b/PROMS/Formats/fmtall/IP2_04all.xml index 1a5d6f521a007dd8e2a6d9c383e6a8914b3637e7..1f0bce3a5cbb5a1998cd56b4a900513333f4a052 100644 GIT binary patch delta 163 zcmX^1oU!3Pq)D z2|)sr7X%3Vg(} uIVfxzZX1xVbL(0~3&C!VCarTR@-y delta 935 zcmb7Dze`(D6h7}ILzhAYwP*=Rq!coQrs)tfNNb+a81suHG>b!nNj3OoF!P$ayjmog5@yXfgdHF@c$Mfdp2Q{&lOZq1IZGos$dNQ+_!*u6C?@9trpN4^IGE1!%bk;AZfN8k`w7?g)CU_EViZfmA1b zU|3!CdEEsU^+@~mx==*-q5pkv)uiGG?`A^$H8XnuU#~B{%IRz~c}wA%MYan~_^+20 zj9kWxiKxBonRg%sv%3i`J+KIe%OTY+y2i~b6)tc0aSMXm#ov7VY9nZYwuwjJ%E+#^ wNQ$~#1vOXs^e<|i(CjFX?Zs7&^8TesQDeUHcH zu<0s{n@uKiumM>WAcBKwa>1^O$qx>CO+K(~#pINQpCD=$EOuhsT(Ik4Gh*E<%7vbF=?m>{eJM=n9dE}TkW0st>MSe5_) delta 1087 zcmZ`%O=}ZT6upy~d>~c&K@?j;n--yQp~*B&DyGsjv}B=aX(BEZv^Il{#<8TS8t7UO zY@ytRXzNEox+)r&mEvMtxp5)lt{@ha)Qt=A2YB9_28x|B%y8%4^UgW<-uG%ntv^-k zwudXn+YgV?1-e5;GH953dHZb#+n(x)49(IsnREmBJXNViWklmZR%ndwBCb%4V~;v` z$JfGfwLjcLIaI5t%u@l8z>0sfnPo-o;HhVw{%OfN&x$|9v+81guhuA3D|-~-iIRAG zC<7i-`ZS?nAliRUpbI#^!0Q9Y_^-MV6i()73g3I8KZ?^3^;(a$6(yJk#Z8oQG$F~$ zasXl9Rqpq-hVn3S8!~B#WvK+qvotBq8D#SMQjottKVmKWt|%P!wunjcd2b+@ry1xQ zcuX7>0zx$^J8){vydzuy@;+60yB@N3{HNkx(Po*uQ(b*Bf;VT_6?hO!8pF4Qu}WHQ zOGWr-s?)!l<#gJ#{)_;gg=uj{l7?6MXr`DE5=rq17 zXEo9T%KkJr(h)wFd42XeW(D`OAX&sBgyOtpEumu4MJ%I;tWXiI@?PR{a diff --git a/PROMS/Formats/fmtall/IP3DEV_00all.xml b/PROMS/Formats/fmtall/IP3DEV_00all.xml index 69b7b34714f25b357aa721a26ebf8e4fd6c70372..7056df924672ddbe2a191da0289e2efc5bafa3ef 100644 GIT binary patch delta 102 zcmX?bf$_mf#tlChCu=covwr9zsl$>%62UFYtP{`JDG7md(ckrZG-F7ND|uT2K)qkSD}A*&x(tb4O?q|7MX? G9cBOrWh++z delta 705 zcmb7CJugF17=BMxFd;${(zIA~Y8i-x=&fG8N_(qq!eF`4`iS~SUHk)+rFloYmE`;Z zu^A*RW{Vg^Vys0x=UhaPU^w@l^PKnNdEV#TUWl_RaatE4lS;HkE+xsq*P$?(l%Xx4 zWg4eGuK7B+E{eTj$^vzP?obiCDJ*r~d`CIc6O;?S7ZJ@P)TViqEg@i)3MjjQL<6Z7 z&=p`gU{zq7h*mU-f^M)))4+4M$1So|(``itO&zMBN?FeNw?;<8AEjpzvWHdC zVMV0w;?xH<1)XfrvMy5v36t_XlMZscbAV&RS)LtF$b+$SKc|PfLQ0n6HHm*k?^WLf z_6{x4I@g*5GHxvT{u<12!ZnBt=z~nyWWs`FZxF(0Ov`zlRGH)^qo518f ztR9=)*d{S<4&m6OGWmk`jLjc(|FBIqF;$t|VtQfnEuJd#>rRQ Xgf`!c-NU%KA)18|EVTJdEE^L5Aw(`; delta 660 zcmaJ<%PvDv6kWI4iWnJO4JE1!R6Oq$kAVS2O!|n5M#P|LZ@lUf>NUbAus?uAVl24^ zjC_E^pi_xYkT6AJoqNjwk)3mL&f075z4kum;Z`f(X;;r$coGGypo9tJxaSbTBof#l zYDvGLOVSsVSIusXAW5_Y3)`6GX^KnT?JrbL0?ktN9mV2UW*!?$HI$N0asT+!pKn#bA?HCfI` z{RsWG0iE@m3=LLu?!ewnHa*Lb2i^w F^$9`*j{^Vz diff --git a/PROMS/Formats/fmtall/IP3_00all.xml b/PROMS/Formats/fmtall/IP3_00all.xml index 734d49fcdd18e4fdc9b36ac863db1f73e657e863..b9cca806c444c1eba49e69c9b1d2b0d230fe5056 100644 GIT binary patch delta 97 zcmZ3|#I)iMfhG(&SD@X=RAx{29uC4lM#gkUvv_0S5_6 zkb?~-S37D>Zg7-hhl);~>G<50faiev6o6g@dlW4I!hsajGKK5m$AxYlQ&{82SQ6AG=iuUtGLI6L!}W=l`&AY8BnDqGXQ6Nk8%J2 diff --git a/PROMS/Formats/fmtall/IP3_01all.xml b/PROMS/Formats/fmtall/IP3_01all.xml index 083837a638fe1ec0ff45105e2906b6eda81a5e9e..a2f00d0236e91489cf31ca8ddde8897cd35e876a 100644 GIT binary patch delta 96 zcmdmVp7GX6#tj!3C(mP&n*2eKWpfZy1mos6%sjS}1yoHoH#inCf*6w<94$6)a=r%U wY!-04$2i%{LuGQC$DPfqJRh-aUgYP(xS1!wPGECN0uu|6P+{D>E|rA|01nb4&Hw-a delta 602 zcmcb0l5x{{#tj!3CpUQr@wzhjGUPL)Fr+frGAK>n%c!iaz~BcIDFKQUGlT$HZa@s; z=fOpRDuJSj3^|hpMT9rMVT@wb4FYQNX9#D=1R7PskiifPl+Fbj;RrOu11Opf6bk@~ z6#>QaCOgK7Zgyklv7PLvFD4H%A0+Gyq;tS*koitPb|OPEL-yoEX35DDY^)}45D}T| z;H0v7pMw=6sTwysIQ=476WF$8F3T95Ax`sWC<8jP2na#G1P2&{0nn)mP^Y8Iy8=~Z z0z(7j9fQg4Zkm&Q+@#o{qLWkIp1Tt8I@oL{NHCxUPdG3sj5 oQj;g>Kij;|AdO|Sm+1$E%^_hw*norz#tjn~C0!X(7%~}37+e?(bIM9+5pt1~xV4x+r zK<$n|13ZAD=|HgnpjZ)5EN?PnwCH9wW-Il{c6v(kAhSWj&OkZ`%m$h51Y{=yU6ei9 zP{?(1kyg~?K7EeKUV37L)tgFA(z!Evm39azS~lqe!E&$?^UWKB|FX$r wlQLp32SQ6AGy*EpWSqRrRcP{?kX@VS#fUKB&|w5rZ4A_92G+6pTD$-g01erOcmMzZ diff --git a/PROMS/Formats/fmtall/IP3_03all.xml b/PROMS/Formats/fmtall/IP3_03all.xml index f4adf19a43b84ae870341309c5c2c1be104320fc..8958647b6dac9fc967a37141f2e1565e939b5522 100644 GIT binary patch delta 221 zcmX>zmE}$k%Z3|_lew4#Chy|p+Z@Goi)nKi>n@qeJ+cy$=Si|n{_#~{vVgI{Pd`GC3BZ0=LhV?vVK9HX8fHkr@ZXtI~x6EMBSzHD=y zLlfuZ951QKeO}Kt@A7`cGPx{BW%IRwF2>DeK|YL|Uj#RGZEpLl!nk?G{R6BJ*0N`Z kV63-$K&&VzSLN3YW{47p|4`QU7#2nuh~V}e9E>7N0EP)(2mk;8 delta 968 zcmcc9!*XUS%Z3|_@~#Xi44Dii3@!|bKr)d*fx(r*mmwc0n#y3ypfvd?qq3p`gC9_& z1SnF>5CUYm0WpZ52NRwAR!esC7sfkGxlATgjq2BppIik^&5FYo r0^e>hV^w7Yj3*PADxTjsRG9!(Su%j!?#d#L%`!6vlkM`%jJC`G7P0C% diff --git a/PROMS/Formats/fmtall/IP3_06all.xml b/PROMS/Formats/fmtall/IP3_06all.xml index 0917f041cb084a6c6327c44b66b6f5fc99e2cfbe..8e5343f33173bc871bd26ac6dcc6f230fb92230b 100644 GIT binary patch delta 109 zcmaF$kg??s60E>1wFJqis=BhIJnCqR*uiT z5I+wtYRjO+;5IqhQ*tv8Qv{=a5Kx0ZLpVbw(3ld242EEaM21|Tc1NHA9zfA_pjZG< ztOzKU$51jkF-~}M3bUToYCo6J`Pd2bG+5FGe ziji0in+@!}n21#jHvO67GDc^J6Z{#f40AdBG6Vc^efvPfr{sya? z-0rM7xyM$x@I=U4#?IW(F8 delta 641 zcmdnc$aJWkX@d-tyemTrLncEBg9}3Bw(n( z;0F{f0g4tggaBD?Kn&vN!9{_pfue~FIY1Su3`(1|nbH|`gMixn8Nz{9qyQCXFa!e? znUqUk`f0H9bAP%LjUqr2$lNz82~lmFO>$%AYF2|EMn955SXgA1U~4B!+es@!9N^DT26Rjj5Q6-Y3JfMlz=0fP zFqzj*bFz?~6gyOOvbNoGR{|aY>QexE2kaR%Plf|S1r#ZuVC1)d$|C3iWI_U~1QaU_ z2AkhI&t$|Dp8VcfbMqQk4Mw1&6B!DCF;xVl^MJt)GOPfs7bI2+Hu|EQyr!r>FhEnl zQR)X2EC(ww-+Z@9lX0_1;TaZrZ1P47=0Io(ghpVMlf@E*CNHQ_*=$w5f*FSnBcN(y Lpe{3@j?1h7f1i&C diff --git a/PROMS/Formats/fmtall/IP3_08all.xml b/PROMS/Formats/fmtall/IP3_08all.xml index a50ab0cafa6ec01ab0de3cc84444b714005ab2e7..cb2ce294c87134c92707a8dbbeda823ee6d849af 100644 GIT binary patch delta 136 zcmcaLhpA~Q(}q8cll7PcCRfSwZLVXw#k6@AE06Rf8L7#60c@LJC}=QlPEfkUG&w;j zX7e*uAF<7SHe!sE^TbUi>)4e{u5&fntYPoRIr))?)Z`uyuE~6!cQzY%Jz|;sCO~Dg nkAD~A<~IR8jGNB17Z+A4=xH+4HQje$eFy}N_4Xn(=8_5AfP6HhH#(-DL|ze48cI@ zT%Zw-Ktnu$qUk`f0H9bAP%Llq!b;K2Us!mg6+vc$gq(qN4wwxxI~^35p_{%T#>CCKrhEfb3Sst}zGduM)6>6B#NeH%hrq{$lk6 zrcWNbJ}0186B&{jvcc-PY|4mM|IpTb^A;OFPF8SuP3Cr!R)&O}KSLSN2Sq>#ihxvL z%tGQC6q*K;|GH{UW^$8ahl);?c6;uO-D$}Tl|ZKf!yTA9oFI-wi<@v@M1oRLDkyH; zp0Wsf0GW{ZEdeDX27}G_y*D#r3QxZ8t+{!duLdK~$%zaFz@$|KwkjBGSOHisNURiW z^ld*=Em419K&61wpdV1M9IV8A^ZFJ|#?2;G^H}i7f2-feB9BeK5ra7pS^}XF(4@<( E0CPCOSpWb4 diff --git a/PROMS/Formats/fmtall/IP3_09all.xml b/PROMS/Formats/fmtall/IP3_09all.xml index d09b3280b4d1537f41ed3e8394009fb6a56f68d7..2931aff37b86189a271a4abdbda536208d2366d4 100644 GIT binary patch delta 131 zcmccB%yi-}{T}3bG!!T zYz}Za#W=amO=_}%8`tDbZg)0cbAQA#d6J*X=1)FdjGHI<`7mx~39ypi98jvlxVffa d0}GHfiw(@3ERriUxhke(a$kYU<`1>6m;v2GHSGWZ delta 680 zcmX@{m+@9J(}rJ+(yk0C44Dii3@!|bKr)d*fx(r*mmwc0nmT!ZmiXjfi~@!V41Pe7 z5{6WUVulbP%MFM@{5-g*ErSwJG?5_(s3Mg?X)`C&OD5eQpf-PoaG>!iK*bph!9WGM zKxs#yA`hTwI#4VCC{_d%%bVQjE4uj;OONH`TS{W`AR9o!&OkZ`%m&%u1Y{>NBr{}B zp2#IWNj+flIwzIQuk5TCN!2sK;TkD=Hm`F!#mEYF%j8BEX=RA3{29uCE-V55*Z4Bky-?#^MEk~GOPfs7bI2+HagJPR$kN} z81^aP*!KepmV=d;Z;ma}WSndgDKuH3L~Zk{+zJ+XZ0d{{%z@An2#tU`=Ck2YWCT=T P3{+?aHg>Z@)e05>VIrHd diff --git a/PROMS/Formats/fmtall/IP3_10all.xml b/PROMS/Formats/fmtall/IP3_10all.xml index 8729e3b6e91f0523bd76dd3cfe89e1393023526a..75e9a7908885b16e4b285f3568707e59d2264abd 100644 GIT binary patch delta 99 zcmexyoN>}2#tlmtCtqU}m>k8yvsr~HgmLpO<}+H8srfQj-mgpKXpaNn_dk%HoaG<|7FzjFXpH2~GZ$xMTCZ&;S;&$mX(WEmk1Qgc$&e C92p^PbTniXt8}@6NgB%)R&A_N{oi7dMw8U{aN8)S`KkcuNYANqO1> zYOx&m@rCdjAu0fAkwyDdLX^X!zU@zRj>14C)xoeR>^MS-$rZ?oRL1YCAaBzu2)jt9 zL0SO11#Age6PV4TYd&Yt{V>7DX%9yez5HYh1yv=L&f>1?SXIg(mQ(ae&pAi`AbXBB7blAjEgIe&ftR+wk{%fIMP6 zn!gMMSqLNQ0ly4hhGS}3%HlVp=0OLN8rVq_w+(|;szIuB17Z+A4=xH+&EPiqqpRd*9i|9I{UD$Qe}-_N;VD3684STd!*hY! z9f1aT07cV*VgW$0BA{3vL&@ZeDZ-mum~WU&cCZ(d2bm6%a0b#jU^d8fCm=hKA(

?x%8tZ+Zo=QJk20vvz=iQ s<76IVsmXfA&o;-Hq_J#%VKG5^^OqxU&sI07DUwmy9Iu z2jrJ9q%ssUgaBD?Kn&vN!9{Hulz^g%3^_m*sSHY+H!>zN>IO0RG59lt1FcE{D$ZaC z1}ew}N;?7-c>qPzfnotbu_B;Y-sFj9qML=7&uC3PAkH%RfuWo{$QF>4Gmy>!vq82v z0ojQ_w`EUe)OVjOq!&S)T4CYI3DInm7nsbNq~tK!O+SnrZ50M>&Jfr5Gn4^cRs@6~ z&!sYeTxI~o3Q*Ug%fmt(tZwp81I@|*45ZkhqLal9pSu$9E!b=)h|keNBpeuwpx6Y3 z`)|Wc7G-CkvI1a46#?lyV5ozn3cyYTiIsvCCYnu_7WD^)WePY({eXhyU?t|8-v>Ig o$zzi;VlW3nOCU4?D$-=!92WVF1&2x_pekdaYBPw+f_MQY0BO;Un*aa+ diff --git a/PROMS/Formats/fmtall/IP3_13all.xml b/PROMS/Formats/fmtall/IP3_13all.xml index 167574992485dfa943a47fa15a81909e8caa8b58..089fbfdc1d350d063584f7fe2ac6b9d485f4fb0d 100644 GIT binary patch delta 91 zcmcb2lJUo3#tlmtCtqU}m>k8yvsr~HgmLpO<}+H8srfQj-mgpKXpaNn_dk%0f5Qsi(A%_mA3U3LI`gT9nIZ8m4)B@p9!uN#~=?ckE3}Ayb>|b!F2LI`m*_R0kXE?NoJY@T-wLHOB@%L>@Jt ztY3ygnvM~J0ly4h!_L%osU^Re%`iHU)W)rNI9;q*h1#SlEA21<>$!>XsEw61g6k_o oJPwe&e^M#+$G;0@C=V;ZGJul8f86MXe;_lUvY>PR%~m1w4$p&ze*gdg diff --git a/PROMS/Formats/fmtall/IP3_14all.xml b/PROMS/Formats/fmtall/IP3_14all.xml index 18daaee22556df11486e6d2168eaa66687bb3d09..6358ee02824b340cba97c74e035a61359ada6765 100644 GIT binary patch delta 113 zcmbPtn{m-q#tlkLlS7yUCNXnOc2H&6yo4!&akCxE4U@?SBs?asu~yl9&C-ey#M!*Y z`WKi17EQBT#yB~|L1pq1hdY~3I6h+8e8A0xakG}k70JypX)27HZIb^m0a-toA>29H GOiTdNOf2;P delta 619 zcmZ2 z0u(7`2m!L(fEdKjgNp)H0!0%Uawap12yeDyiel6c0&4PS2nQOT0#us85Db*g1sdT9 zG{gfanhq2T0E!g>#qte}*!k6N-QkK~6Q8 zoNA{zIm=Fp9V$Ax+3vY30dIlLc7k{j&FkU7&;mtMDudGIbo-|)f*wF7BoIqL@x)-T z+1I5al=2x$p%aUle47xHa9T!Fi-Ylv)g=$O-^pJh^iaoWCbaM$!DaZCdX-s zZ1zwuW16gBk!33+!UtoEPlFxcNayi2UX&bt;UTi%KO}A*@T)_n3ez6J`M7h&KfQ delta 850 zcma)4-z!657=F)eazUYnSn&HER)QEsHZ ze?$HOg_J8L_ax8v%~Bkt)Ayb4Jm-1d_xaxUy?fJ6j$KzD8kgpq8)j&cb|^zx8mDf4 z)Ng?9nPtvsm)GP(}G-phL8~PHP61K{Y5%IRvn2lUB&2Z3ttK>Od`EOTbFN z3Vc@f^QC8$UlO&^9Kx9@Nep|HD^uD^VL@G>1?Ud2^3oj4lxSbvdwM&A(vu7t$2+gi zl3*zesi<3MJqe9pLM=XLD#RQ#yj-kz^ZH<$SnGAyNP5Vbz74aMyaeo-oN8!=Xi1#+ zXT1C{RxgEp&cggx6>MeBq(hGR=Xhe`v8oF=>!xunlQw8e@mDA9fAe>z=EVEtLY+s| zhEuvfRH>4oN?AgUWV^C7gFT1)$jS|JTn`7o8~F#9P5n0RY`^lP|?NkugWGS!L-R{Wj~722Ch2fPN# vmr>K31Xxy-5n&Z$wE?GJ5gNf0#S;N3tcmOLo$C)~1gs&jhbzpRqej;!xc$NK diff --git a/PROMS/Formats/fmtall/IP3all.xml b/PROMS/Formats/fmtall/IP3all.xml index 459077bad94806ed90da05287bf5d870d6f94dc8..8504786ae380dc1cf56b596c6ef1adb954ce82c2 100644 GIT binary patch delta 152 zcmbRAnQ_i*#tj{elXo#rnVcoYx4DnWjB)ZAW3I{1n5!n2vCNxnz?v}m605~#C$=e! zn}ayE8BA_q;+Z@_)@rhWe#zt*8>h)WRueYsS&OhuUgsz^`GVuK$psQho8_F(uuQh_ zRGF;e@o%$*rxfGn46hi*%`83#q&6QaRAJoAlu^bCVI9c3#{^_4u|T*=&M^|PL+mIOpu=ar;uy~4s3>S+(F1RG4TTBlw5Q!SZ|A+4o!8&g)_2v}RHGgR^oUmJ zI{Enflpv4h=n2poU7<1Vh6Z_4ZC^-G5$Gz=HdV08W68Pk2L&6bPjxVAG^XPrPq{*E z(gOZZB^_O&43gd+cy(kB)D1+6R5Fnie;#-x*}%Dnad&!9$HLoc z@$a5kD`iltCOrfoD^{hbBvzsq`;A+(69F!bVBj@V?%Ly45`}Ml)c!h(lhe;)`XGe zoruGoLwO|ob>=^k=#ALF zh61a!+-GVDk0kRZ6QZtmox=re?c3QlMe}EQ$otWc>uCOj>IYfKZ)XqcJF}B2dJl6T z6SF4i`D4L#7ty}}HbhQJG2PWK3-4oY3BzA1bu e%iO>GDfAC!3apD@Uk3Axv!`6rCYfwEL%#sSwZ~)t diff --git a/PROMS/Formats/fmtall/MAINGall.xml b/PROMS/Formats/fmtall/MAINGall.xml index e0416c5c45d6b7cb36dbe1bebcff7041492ccd96..2fcbb3972e3ed282e1bf1f6a40fe10bf57141a52 100644 GIT binary patch delta 127 zcmeyffU#pX5#^HI(z2jyV%dCA&&8S;{mg}~T6y|se4V$QueI%-% z*-O3DP#i9?1JQ?BN1TOj4kt{mkUug?8`16yze67yxa<7?jcdQt8aFjFIAr}QKSkll zr@nvBzwf}9kJQjGIYZ8_ujqr2#1+9L6|DP=A`ewY~z65`^6V diff --git a/PROMS/Formats/fmtall/MCGBOXall.xml b/PROMS/Formats/fmtall/MCGBOXall.xml index 3ca80de354276d1ddce87465d9886cdab25d9355..81a9cafe4d5d287d42d8ccc4dec64714b93bf586 100644 GIT binary patch delta 301 zcmbQx$#Ua2^M+eYlX;k@Y`(-?$23{vrO@UHY<(<~&A5vu%L(vJ77!Ge%)xVGatp7( zWFB6z$w9nEn~(A4FitMvkJ%(3!nk>l;10>j7MVPg4Gd&9pVM|?oZNMrYqO886zk?4 zM*EmIpD>eS2FoXe-rLM%-NiE5!a-~E3wtjnFr&|DiV#S8b3*7MmdOgvEt^+FDX~vB zOOl%WAdzdbS%Svo0#38Z3U}BhJEYr9-rz3>RHU?dPjV6qyE8)~LjgnaWX4R<%_SLX zMVq(WvS9-fDvX=;9yPE`-f~N6^Q&hqtPr7fZ}%`kSerhcg0LpDZ4jF5@aW0rUEi)T XLgX&|`~p?Q^Y0miwcUV;F@XsHYmIq$ delta 1517 zcmbtUT}abW6hHe)aBIrOFcozwmCKLKZEZ+cnjd|juDO*FPS80w%WX1URxcI!qC^NM zdhV^);J$?P;7f14_+V&6NsvVl1qy-n(C_~LP9l~HG48#)=lt$Dzw`B9{i$1+(?5Ho zE$^aH8mDRMq+#sCWT!6br8J~54z}5NRr|QwPJNI}Q;eo4jDOu&@}9~`x!PPI?&vaF zM+YTfBt>z6LzJZ?e#4ZZ+qg|*pMboTYRJ#+tv2z?u%I_ci<7*3*UAqHGh7%oAMJ;~ z0CnJD7LUfEPwg@ozt;C1IAwirLy+9A76xp!%}ffN2}Y;W-SjRL|NPzk}m6~@~k5V)pM|^p0}NLQRk@9aQ~WRFRgb5)VBuvl+Vs7M2)o@XFl~}wyUtmxG+#4ycRiOd2m`q~^ zjfTm^469SE)Sb^n9NZZx+wHVSr1n6pF7W!NHeM>x^Mb#!V;^$p&$FNzr5k_IA3#gV zL5S@H&^eUQpA69?1W_o)uwtMqzZN6tK?$7189>AnhVQ8U!OIUZCJ3$ VDvX=&g+5}2uvnt+F#%a-%m9ppDtG_@ delta 621 zcmaJ;OD_Xa7(Js?QE9{@P7=vp(BU>h^s_c4SP^kD!k;?t#K3TYgWi6h}K zAvx8rYKCdG`iYLRYTe;X342prt~QB0H3h7|VuuZmG0Z_Gh%OVGCbmOtQ<^QqKJm_J zV(NaCL?-o;sD+F}Q@}E1rG_%On%GWpU$|>F%T@<8qe^;O>+IL!hITpkR|iyR<>St% z&ZhLx|G#k*k|4E#a>4wm*GIGD^FmLr91polpMyn=Uo?=BH>{3cgR1q zavOde{bvZ~P?<(}9T}|s7&FO>Qhqt6y7jl&=lw?kBf-1QIu9Br;l5VH?pO$F_N4XV p3H-{V7lQ~nDv8A^Wzl+)vDBO0Ij?Jtzg2_~Vnr_^=x0^b^8tq#iY@>E diff --git a/PROMS/Formats/fmtall/MCGEBCKall.xml b/PROMS/Formats/fmtall/MCGEBCKall.xml index a845f31984fb8d1491a1500546af550f2a0b84f9..6c13c4217680b7e2b3c0ea37980d703d1917ddb0 100644 GIT binary patch delta 229 zcmZ4UlkvDPomh!UOB(+`$l! zo5t`5m{ju;2a_(&om@?7T^!wY^1Js!)P#k+yqEjV`Mz_%^XurR>D@2Wd#{DRY)*_P z=sMMChl+HG{5)HmWUs|J>!TE`I;>5~;grNH{;Pc}-?e&p!*Vqcr-zh>y##EQT2#T4 zrv^R4pN?-?MW!(4r(FEXve%1Ur37x>1tw4TB}(9nRHr6CnK{q*&f54>)4@Tj%_S7n z=?1<}g-Qz38u^Wg^PopNUiDw5u|76u;^Q-R(W!(2Wl`4x0vGXA zdnt*_g7O;W>)TaX`h}1vj{2sJJ9gd1xuSEvU-Fb}ToPex(2$Yg+kchtp|--$XTnC% zZ5|zlXdG(WCS%{TVIGq8+RML_QywvPB2|^TIEy3-s2-|~RF=5A=-`vU1*3a8WEPaU z!4xr*VnRjB^B{iZPQ1h3*vDZwMkoHp99LS>)JC`lp56ZP^ja|3-ye3>g!yEE7nA3( zd};-hbvxl<=bH27%{FJ;cA+djIGbJpWXEI3tboD$zeKk%v|_g~e8%|Jf#ynM&UWM~ zr(jfT6frL90h4i3+CSwU)T`t9)ZaR zxWy*3@fb~Jd%?H4gGYgJ@+;n$&1HNFjGOHQen~);^Gwncn9O0Quz8cF660nzZ57td zH3s{bH}{yxF@u#{sFmByX5qy;St3wl^D0{(CNLwwVTKTpp|#m1IE-oYfzTYr$qtq+ zn=gewVx6oICpGz0EZ1b8IEl#?F#?kXILsz*_@*$~p+sSFfhEu6a}E}pm&J>9Y`*r~ zh7CxlFm4Wb-vIQ(bEVBZUs_lpLKlARVS=!({5u6n0}Z;iy+N4q9+)*9$ZFVrPJ%Ix2>>jwfrS77 delta 1680 zcmb_cUr1A76hC*n6F1#RWl4l>Dig<6|)$`<@@ga&iS3+`SYD~->%B* zFXU%SS}wYrtM}6d8lxc!@|M8Xoc2&Q*&TaM9?AMoM<; zAO=_rcaicWFq)xLm7LRivN!>2M{^6hC>lt#k{`Qhd$sde+iNd89A1ofN-P)l7N=kK z-ZkGp0>(>BG_cl^G&9WyYb{^;7Em{t?0QY^dPjFc)D zRCYiKdoC2QM|2R0tQw)q|%diG2EH>nLOm2HS&Gnc!Ub zwyjC&)kAI-@%({wa1__?UgImW^g)v{yM(j&(@d#Rn;O8D-FJ_ta-^AflTqsb3n&iI Gj^+n0dT>hs diff --git a/PROMS/Formats/fmtall/MCGall.xml b/PROMS/Formats/fmtall/MCGall.xml index 102f9698f3c847746e3f4817a8623e340dc3c0e8..92e44aa6c4f29c66e7429e412ea988c6ec5ea0fb 100644 GIT binary patch delta 281 zcmX@p%`)X5^M)r(lf{^)Y`()>$257x6QRws*!ox|J8+k5{>E*^IQa^%z~mTSvB`^g zjW&z%#kowAt;E z3gc#xyArHG))LmqZjY2UtG#Gp-F)or17?WiyHBT>z^qN*&p;TPd47L^vONAjgRr*e JFf%4F0RVJ9agzW5 delta 1671 zcmb_cO-R#W7=QMaqGN_KGR?LYRC6xpTvH*7rS@sgwwWDrI=AIk+tlgO4jlqdcI%PO z5p>8)!Yg!%=+Z?zcnE^ZAzv2wAC%uF@!^agO-RyrzA8#7aGoOj4XCD1?9KvE(_Em-4u&PR!`C zT6+g2K$4*mfP<8yG=34v(mk9ev8Nz!CmXehZ-!@jvt%2i0QM5U4af_95_#(2_XGkcBM6n$Kqb_{AjVjbRPH-q^<< zjK_4%bc35ptGLv3)6uQO6$iW<%4sZ_=Oo?5n!sIFG3ln0B1ka|oV{s{{4j4)yAAfR578f;usTo`i{Gz2+ zOjk_TG+L<-gs44;Q}8l_e<1`dD<4NCWN}rmPmrA)9BFiLS(8#j?tc>Ulxu){?;Ck@y;3ZA=Cws<=Tp|n^?^5{vvpQq zTz2@{nMU#B^kwZH)KX{XD)-{5s1MBOE%I&4_Ey^_-=k4HUHPnSY`I_&OV?*h3<`h; z!nH?Ls2^=D3z9|K$Og&}7NytNAGUKST(i^N>G07#_;`s|)~!62v+_!{o}aWH?)Znh zcqQlHc$Dt^6;MA~Sw6@3c1WSYg#J_zvnUR5l5Sze5r!OL!{~hp9K+X-9Hfwoovx#} zcp06@n*9*Rl;PL|s5;D=L}b;j5k2p#4F&JrxPM;w%EOV>Cg+K8O)juw*__5SLu9gpxWVKoi6fhDNT%pdZt+x^e8uy? X=38Dxs+-dao-hN6D~y|+%G?+MnSvXi delta 508 zcmX^1g0bU0hc05l}2|vSXg;6hJD3^}#MeRkKlCeDXQ51CwWn@-PQ56ipWNlAJt&k44rK=$2ftEvZ0L zJ%Da3LbKCBnQd}{I3HA(?B+i46n$1_pd)f7|8|pB2D5<9DFZvW2<**NV1Pk_(3U}o z!C>-RH_geP+@#o{qLaDZPdkGG4CG~qeh?d^HW}#IL|`B)0R!C$$Vz6&MpF?E3@%XQ zq%tUNzU*GAD(VjmofNQ-{eXhyU}MZTs~6s6+$@tXz$A}N-juW9}}{`a}(SA i%B@Fr^Mo8079gR*I5{O&X!5Vfiph3)YMYyiJQx9roizFY delta 685 zcma)4PcH*;5S^upNZ4&tl{TxZ;!uf12?!#Wx^( z;pXH(BJl<2jW`H52M6!BEe8>C+Sxbn&AgfUT|G$GkJ9P0#Jbnj7^hh(QHIajz5FD( z42@!xqZKMrmJCW#nRY3UXc8=w;*l21%nipk>6HKufk( z{1?AazL8bSS$E#rw*YE_mQW@GLJnnDr~qLU(rKVsVDrFCU`0Nf^0=!C(Qp!Y9z26D zQdMZRwUVO7-Dy2hG-Cv?C1Zz=C-?bfLF(bZr}gt+@pv3#M^~L)Tch(W5Y5fOd2}i?3I7ra)#twTt35=bwpTZo#9lK1}I>|LV PeoYM^6_Tvm!n^bd5mTV? diff --git a/PROMS/Formats/fmtall/NSPAB_02all.xml b/PROMS/Formats/fmtall/NSPAB_02all.xml index c33efe587f475462d1f364bf4315225c7227e9de..4717148c8b473d18e0d4cec783e11e01f573f461 100644 GIT binary patch delta 205 zcmZ2>hOyxQ1%j5)C zlg;~7ESM*Y$m?wm(KyCE`G>mHCc8Ao$wy2};Os}{E|Wb}q$Ug4T1;MK0bwgx@@?C z0##_3O#GVENe11cGEj^643!V0{=qcOBT}L{vM2}E3Kel00m}yaInFk)9Nu|E7l4;& zfTA=Be3>i}sgs(n-=}e!plO5)AkBkr(h^cq^o&M<&H>8;vw@X(Z&q!sW;jA4z>DBn z98&s}DYszdxD|er8RX3#pE8NkPf_KGtAuvhR7?+ay{DD4$`&^^H_BPES?Rv)Su1U&>KdK(w^HmFrWucb;FW?a5ADXBpQkQ`((E1^=CyVu#FEgKGD(j!_Qx} zwx*+%I+N2O{aU~Fxp!AOJN8iGaeerV_&eZNBn>K8>!C)@DeON{LyW~&WY6SpiEU5Z zZ3smhZVvGmE$E7eFP)GiO(;gY#E))ec})+V4zXhV6srRt>(0#;w^O?p4_p7F1!^R4 znQGPlqwdOVr>l;(+}#ziKihS29^Q7`AH}yZgj1dtYZ%k8uJa996cxWSfBcaNxU~TL rm*IJfUbr$k^->c1=p&7E-k*6a5)U@yuopE3MZ0=!R#J#zR--ms&R)E0d3n46%e~EpYoFXAGSw_NR@-m5e zldYsqZFZ1J5}2%JFSq%Xju#7+5sfN`>!i{Ioqjwv8|^E9Uj zkib5Ok{xa-Kur#l4MHU*Cj|6O_VOq~;`?k~;dzD$Nnpa}CB8cBlj~wNCNBsT*&G-8 zh#6>>%H$i72PRi&C~b;f$FliI{Jr4KV!KrsH$T`S!vPZywO7uhGO9Iq1O{WB36a1mi(YgaZd+qR+bvrjojvX4ChbXXcq_W@q;0UF-S- z>(d_!*EZMg>Z3C>NomTkugAfg%BIgt5m@q+p=*@D=_DR`pV+ptlCb-Fak~y%UdPA4 zAn$n^q$G{VSYB{>o?Gu#4uoh7ze$>=IP59-^uhZI{yXUaGUO1K!O2U-o-%*7l&6@h zj+Q&Ty0k3CbYe*qq;^jF?OaHxyy4hzgpgzuc!UN>iXD^b_?z>BX4r-xAq^3iAuCDa zNEbrEVOU3ClV#*!o8X7@4(^_>=9sHsI|oY+F>yS%z?k8wgMGYaQ*E+QS!BAj-2nD= zM|pKmHD_zf>_@iL7URn{JFmDtR^}16)fl!l+fNu;DQlOa9qLl#Z`AfUXgPOalI6A<~T}@)Kre^EB~d$3C8Ear0XLERXi&%t?#9Pm7t}PnQ37FNol&!{r$G z3jW;S^vFGxBWnzhJj;PeVNjD8W2Lc^mm*GaKeA%w)kA-OC4Ro4)$e#w&!QfF9edPk znnIt<9wbZA)g2;+uu*d1vF5zo&?xT2pQyGluEw$%UxI+phQG!g1K6vyzAq6tOzTCo zisUQ5B7%?imX*ZY3_Sm0-BJ<{0{?EUD@EN#Z6smPPrUhH*ojCK*VtX=dAYTF_@GZujeK@4x+z2}{CKi++p52EoT8m~fkjIy*vC7LD`f0cX` zqj}n)EWcm4`9wXNE{yZ4*V%5RDn6tfo5I7<0)As>s{%H8A3+POr}vW|IZZ=;^s^y4*e5x- zHR17Eom-_(Vb9t2IQ7vaY!xZDIqGrqQ9Qtv*~Ne9#^ULJ=qk;2Jv^`U^w%m&(Vl&! zx;+RD6RpkIsy4tAil3(yPs=yTE6QE$kIta;p-;QZy6%@TQtSO_)MpMP&JtZITu0V^ zC`o|(WF-xn)#K;phDW0~@(bqGN!iieNE)FCg=(DQ*@xKMh!dm$4bup|5QS^p^7)|n E1&bT9?EnA( diff --git a/PROMS/Formats/fmtall/NSPARPall.xml b/PROMS/Formats/fmtall/NSPARPall.xml index 1889076deb2a0ca176ffbb5dfd21c6a8d89104e3..379028dca40c94711163f2f1f17a782bb34e3177 100644 GIT binary patch delta 255 zcmeBr#oTq5c|#KO>BpT6{;4KKZLPNexTYlxk+u??Ju#(A0m`C z3&ch-PHqS*fO9tYL^!cPd1A~U#${ zA<85kHJF%iGMYUYe`4arqoRrN1VIl*i5D*(iQn6Wq%kYm?7p{eX1@8pnR$!r(&Co% zbX4NdNM%tkou_Haa{8y6N2DM19*W_Amd5BRrLgP6EB>dnZXgT%$Rhd&xtEo&r4oKTlQ^w_d5-FLH_Oc^Wj}1zbCY$;*#@ zCl3t)I1O78-${T)z;!1vfABrz?U#2PYcJc~fyXP1bR` zWJIg5KIOh4E{%n{PJ0pk(T<2oED7+8ks8S%PY@SULMVc$rfJ=^n37VU zb)9DUcdC{vx{JBRzh6p_#vi?IeqZNM`cbM$gS4oA6quTYgkXuxYnr1>6xZzNE`}#6 z>)lOuCniKF7a%dTcar*{H4d6NR0Au&RmFrfE#GbdkAVKVE8*r%pUmTGHLs;*UQj() zy`1kW)whR_*?3`4+tWeUQfKA8J%ShC*epB_=$_&663(jC&ceZLr!ER{`gDWTNyo9) z;}#fWtFNdpZ2TZzt%$J~tvCB2_M-k7NK8ZGN|BrIcGmFHxv>6dqRxQ~2MukbYE4N& zCcdTmcQhX^D>$bh&rG%Q+MR1Ck+)~hWJbf!AZ>=O{6l95Gb%0{u9&`(|13MB*qWnj z-oT(fGgme2ilaAK<2J|OFmFg{(+9pZ+w|2>Ph?Ab2=?duYOO-MMET6{mW@C5BUV0b i6vV7{;0aOK^zHj*mn>7YoA%uIRck6i(;ogcX#WfUcR3jV diff --git a/PROMS/Formats/fmtall/NSPBCKall.xml b/PROMS/Formats/fmtall/NSPBCKall.xml index e8559ea3bcd52a1cf1995c2dbc6cecea927c60db..5d7289c95cf24a775a1415374d4d3eee751d84d1 100644 GIT binary patch delta 91 zcmaE`gYncR#tq*XCu=ZG*=)od#k6?|s~h8FHui|g3)n3te_&s*nTNAWeX^at$7Tb= s4a}2$Or<90nVy>bO+ab$0<#dQ%_gBLjGK*uUN8Y!ADAKBoTx9106|Y8asU7T delta 724 zcmaJI!jQs47IOaKcGc$p}){J zoK3$W+P9IYenE?9-Ffp8`j9qn-aF^Md(J&??(53)opSr3^kt|(C92T^nOIF4pbV{0 z8K}i;L6zT?YioegR0LCL0=7M z4f`t4vU^vY?Iz06XxO>-XdYG2N3@Rh)NL|FvlMY&+LskI1z&rhG}7Uz3>Q%0LGN}{ zVmW9R(6tCJCLKa81-&JpyTDd~Re;$X(^cNly70LvNl>GTvtvAX`deL{ RM#M8TNlBWOl^eNtTXQ(@e^E=`UZ!s5wh0Y`-h1wOck@K~_*XeNQTWe| zYc>5eL@#NIEdHE|^0D%*rJ1ro7RjOo8pZA*mN?I!p}c=P?(F(@eNjPIXaxUd>Y*fc zQa2@eOykH96=(%amU5Cw@saj5){8>3RkROLFC=I1hCa!gdTl(9s4@!oqI8C4s6@|c z7?=%go;M0n{-wWZWqcTFj1Qudvean7 zqYSdy9*PgTRDOC{*KZ>h{a2H; z>jBgiY3?7@<9JY!*}|B-3%5Gk=}dbxhc}#(qm~8XPEwcCVYMkv-Loct%!|KADcrcF mHh7VpVi4T~YqPpP;dRHvv!*ew_?-3f71dLP;U?L$Cw!;CL%Q?; diff --git a/PROMS/Formats/fmtall/NSPEDEVall.xml b/PROMS/Formats/fmtall/NSPEDEVall.xml index 888f843ad0a563169b66b545383552c803f99230..53720016b0119090996c584c87305f97031f1c6e 100644 GIT binary patch delta 151 zcmZ3}#B|^X5?&N+SeWONar}P@pYHmKdxU57H9agacldc0(1qt!H`B&|>%~mEoq6+p-+c4ln~y(3FCK(nHzETI zRH0kcq^soM>ySkYv`BSCUH&{0V=t0EZ&4nRCb_gtCCskjCu^@4ogvzulIpjCixWAV< z2nlpJ7+M2x9RgBN2ZRDY?SI5e*?oRC)BYcxUzt4>jw(OAYYz--XMfjOH?O!&@rFIh z4ZHtDH(~tH{+bK6+r61e(G^%PqZf|eeFgm^kIhA!*X9<-Vg)p|G*TTUce}4(+W)XK z8uAaTvqn5-kpRo6oko8in6FDhC=ee&C~q7`p(~Pr^A81 IQowbL-y%Kk1poj5 diff --git a/PROMS/Formats/fmtall/NSPFCall.xml b/PROMS/Formats/fmtall/NSPFCall.xml index 0926ce0843e57a6217091d02042b2c9028e350ff..6efbb9cec46a827a0f089139bcbc1e665e2344dd 100644 GIT binary patch delta 125 zcmeyejA`F|rUgusjhLQI_G0$f{ES(OWAYtQp2<8)9FyC@NHn+yi35#d~%$cz$8z;$rA#_Hg|bEV4Zx;Pik_5AJ=3i{|l2pDJyNZ3OK;B dSs>I$Z*y6*9UG8PVO;#Fixte+Y%|e<2>{@IFeCr~ delta 855 zcmaKq&1(};6varRHqPU1@B($23rqUw17$(+KYf{E&bt5T= z6cNGRKR{P*Ro-6kFQ^MQx^O4Bbm6*q-g^y3i89Ra=DmA==iGbW`*_D%%30c}VD6#%NaU!WJ zS*-GDVjWdx`HbzToJWd`0Qb0`qE>gLR#^LIZ9{EBv%KVN~gZxU9{LLt@tL1X|$tdwN%>JwP&4uYiEH1573fr zH$l5XyXVRTbPvcj)e01d46w`^0^)V6%XWOkP)Ii1BdQ&nJuQ#M4<+>EbOAP1ueBE+ z4_R14-o=NuMh~km`RLx9jVR$hqXRxGlrg|v=e^H6T`(2O=eaTYIybWa&)w4Ogrxl^ z^5b|a_g_DzLl@}G$L+ryFLD_A&hiea?MvUH2Mb)<8MSPC)tgG?M7+eo*34xoGGN^t xol@7IjfK>)jgdV)&oky+KGg^1Y;#kR&+DqTxf5}Fve=C&WH60Mq?zYMegTJSx9k7_ diff --git a/PROMS/Formats/fmtall/NSPIFG2all.xml b/PROMS/Formats/fmtall/NSPIFG2all.xml index 05d58d751e15529e66159e500f4074e5754e444c..640e7eaefcb4069dd0b570c403ece952fdca6be4 100644 GIT binary patch delta 232 zcmX?fpXt;krVUBVlcz90n{21Svv~*0Gv>{oIM%RF-X>r%`GFnFWI4gE$p-|tO`aqa zGr4RH-()-CU6U(I(+CMQvb#E}Wb*u)xk+IR@S>0qug4rg5p~)y>AHeTJ?0sYgoARPHULSy>nbj8 zB~yntMrt9l~-@&4SJ6yw*}eZp7Mn#!NKiBS^Y2P5o#`$YBzbFafx@HdkauQ?8A zD(G(B5`WTm6zjrveA|_1_-_MoQeJ8mg$r9GbkhFOr$o|hIBVa}x=&9@x)yp>S9470 zbh3|U%;g3@xg8Umj1!Nlw#^etS+)%zywwMl5X(~Q%PmVW~`&?w^o diff --git a/PROMS/Formats/fmtall/NSPIFG_00all.xml b/PROMS/Formats/fmtall/NSPIFG_00all.xml index 1ca85fb5bdda4851ef21b32714fd5bcd03c89646..d349193b503bb6aedd3f651e58d54fb9bc0ff4c5 100644 GIT binary patch delta 83 zcmdn;iE+nk#tkPJC;ws;m@Fm3x7mwHgLU#2_LRv?oJTe{aLv)4oMNUid577t%}306 f^ftdry}}A4R2Vn^$?0Q(u+9{HV}h`F$~Bk(!hR!2 delta 607 zcmZuuOG^S#82u*32S|?z1~U*JwCI82tH>b2%&>)zGIHB6Gnu3oqZs{(2<|`V7Z}r` zP0%7Dh&KI#7VX+t(7tm=42)s8!*|bj&bi+`_wG};{T6!9f-grJ)u}^Uq~NbmkaAR@ zQ_|R%>}5~FbSOwg>^r1WoAyy{WAS}!h_aH)Z+-}ij>sOUC91+u1L2q|Fl<7Yfiw@a z2CNLs0M=shy38hAnsk7j0e%JRf*PbVCAGm0J)*>qJA>nqrK+JL`2wu(SYy#Sw@r7~ z<7HjfgVcel0#_A|W$w*x!ZLfGar$>KPt!U{2Pcm?jgfOR%;}zT{AtXX`+6yx#TX5Y z(X|FOtn2BtPGO2+18MyG8D^x_GAY<;oiAtrD ze~c=^Aeeo%C))N`2K~qSrRcNMrzuSdZ~|h; Ut{q1LDO$#tpw)rZReOHy7lyxw+W-In diff --git a/PROMS/Formats/fmtall/NSPIFGall.xml b/PROMS/Formats/fmtall/NSPIFGall.xml index cc6a4af09f74c2904b86eca4e1dfe2858e536ffe..567d63c380401d92ac4e24e0ad59b1d338ff6fe6 100644 GIT binary patch delta 230 zcmZ2=mucQbrVT%sCTlT2o7|Jaw>g022{U8F`vK;Psr!4s3M zgd!$i5&AJnoMrMckz<=ri7gYD%%LVQIl)k3azLfdrDA3CvdZDwh6ajoqWSU zVe*|Aj>!VC$0kc?C~dZjYhc-YCFz~gf@#(}X#q0W3c}0I$Zx>ue8c`AorvUYmo6F7p zd(v>90G7gU9${f9t5H2|e#D1OjZI;?0IP`eQV)krZ|q@+xq^IgO3)y(<^;-G^SD>F zr6Dy7(U-R6jlntvTM}F)a1}UQvGc}#BNxqU=F_m05R<}NM#f2AKN{pEi_NU6PtZjr zatg@u!C@dRb&$sfE1$8v;*Dm5n81LlE`_Wag%hl(QK%R7bfFVy)FxU()EY*i=O+8l zI{B?vs+e}^l0qK)$6I;PAUTH6uDl{vOdy7orGKQG*yWSBYB6rbw##nob5n<4R7V%b zu<|s7+7eKfL*?Rsl7A&Tc)`ZSBIgNI;&8elhSTPm4pWpBRMNByko^$w0&e73ATOvTiF*^0YN= z?uFvyV{>GmE`SaOadPg!KBr#~{x`YO^$2J(bae-P8XJN|hb%XTI`_*T#^xk*3|Dn| zW>k9l)VXin_5?bXRlcM+9A*{BFFT%j8suE%rBoO1QSoE<7Nqui@qN@sU8>L52USf+ bJs&^$usK0IUDT`k8lJRh>+<=4&uf1Jd$atq diff --git a/PROMS/Formats/fmtall/NSPPEall.xml b/PROMS/Formats/fmtall/NSPPEall.xml index f33bce2ccf9ae19b4d4967d80b8c500ca0e90cf3..ccfd09f52943b20b9ea149a382f6f6aa53166509 100644 GIT binary patch delta 192 zcmcb$hH1+prValXCmS$5o17rXGueYxXmT2}*5W73%#%-)@=aD?Uo-g_hsk6;jw~R( z4$S_i%{KWCX9}3ThzlfcGI@ak+hjK$fypi0QDD9UPsZkJJZ+4VcZG;dwi4o6ypNA@ zvW0-aV$U_A;M5PfK8Oj5pur3trz?CmRJyO}-PrH90Qu!el=+rOnfV f4zO&_3BRGYc}tH9BLV!;Fe3iV22 delta 1299 zcmb7EO=}ZT6umQ@rfo2_71P$1U>Y#BNF{2U7O7|w6SGK~m=v-QG%<-EX-&p7THVzy zbQi?CR0O+nAs85!B5vHcbSVhIWmoiU+3PObLZWT{`HOC`lU@p zsYJJ_K^LijyFgxwQj%)0mU%Sh<}Ka9y8fNbsNtz0qD&jK3V#eg@m`fTtUPtb!$0)p zY>3uzYP3mNL>Cd$!8k`g^>lMM~cekzasf^-?$a-+tp_xbW0XpqZHl1$)WiY z3YDmWvKs&sAoCo`yZOSPpYx8#wsR&2Dzzk@#vG;HQQwHfbcW5|AQJ42=|9Ivx! zC;r*8gRdGR))(h>ZNV$WVNym4KypD#lI$FaFM#4K?mOTx1h)2s!LAcWxqaNQ;s>1C z5k+Q(RzPtCW!5F7a}?yHt1zeRiuMM?&|NMLG2DbL4Tw4*s(g3b&95H~Tkl;h?Mg$U z@0a8s*(<0l3KnHD()V;FrU=Lxl&@n~t*ip*0iRFH38G>?g^)&-?zK{Og%XEe>rihE zcSx>Cy0dg*SgGFDm|;~8CKkEr8}o>56BDU)@hqAu(nCyI<>|xYycL|_{H0-T4;p+n zb;#O{wfiF~JVp1BTE`K)QkJP|p5FfMbq(;R#4LYKOuF`4uZ0)cn|vAhZ)5U53!}v% zt^L({4m63+4n73@%6H6aCqEjaal9%9)fxw^=b3LO-6=?*Bz3idfKA!|DeLW%Sk|w#tmN>C#x}S+swzjgK2V=FxTW4tZkE9*yc^1#x5|~kKJSP4fdYNQJkkX zCvfX1ZN8_wj(PJv!zt{O?^#MsvN|<+m!Q(*6ltl=KGu3#o6Yi67&q@olVgUk#Il({ SEG-rYcSZ3Nrp?RBYM23!pDwll delta 895 zcmah{OG_J36h4#D86Wl45TljR7*~oUK~1!aDmJ9(!lX7@S7Os7T5U6G3_ie(n{L{o zaJFu27wtl*Fwp913`e}}3d+-_<^1p*dwjyYMlbN+67DoaBM7ok z%`H=up>0@_l#-SK{!{(MKaNBzWi$@2chVN&55|00ap!0moD#jEG$IrrVjMCifGz=h z4y*{wrV{_mdHK@#*zywZB0SPKJBXO)BXhDtDNE6!^jQLDlp3gxYN?jHt7h3Y4R2VM zw+4l`EY6s}>r1F94UeqI(&HUdO4GoyGP}sHDiJkDZ~|pp1y{AqAjURgd~dY4IaJkj z8x@+Mn6K-7eD=VwCQ)ZW>dzzd1nMu!SEZT+hr%_k-geAzMr-Bkb9~=yZq0m(g$WJ2lJ3K85-$z5TDMIV^+7k*A>ZDOTw7r7-!NoM#fC+QwmL zf4x_8I$w9{emDCd4JgK|MUUR@#uySCtvK&j486;Z6Gby(*n516d17C9T=hg?-_!pB D33|mW diff --git a/PROMS/Formats/fmtall/NSPSAMall.xml b/PROMS/Formats/fmtall/NSPSAMall.xml index e7c4d73ce8905e002ce095c1cf3bdc1209786664..d5d06dba8b9788954a38c38cd57b0cfe53a19714 100644 GIT binary patch delta 281 zcmezNka^2h<_!-RCkru6*?faZgmH2bi`eEcmNfRsQE~#4Hwf@e78Bsx#G}GEc?Pe* zkyjkcVymXl}C0^^Hw~424$Uj8Nm$FIN9q))8=XK5|{wydVD1S delta 1267 zcmah|OH30{6ur}_CDHN|D;82p1`}mrS}841F`)tzh(eJzYH$HfLHzKk6+w538#fxv z-8U|bD;MZvA%=ty5;PKGLi{X9jK75&Q8unUZzkBL4l&JZX3jnDo^x*Q%)L{8e^zHd zDV6OsNSA1W+9-kl1XWWzbcOc$vKSQ^+E zKbUjz?3W^b;k;jZ21pvNV>ma_Wr&sjAXm9dc)(#Vl_N+&;ev5{7}dptr;X}E&0$e} zT3pVj3Rlig;8y-TvZFWs#=uA#j^GJSWgZ#TZ%oUqZR2LnIK1BAXs1_>p)jk^Luvk5 z;g*g)oya|Eq>&TuK-cs?+4hynwE6cdMM=>uFF*HIa4O_rJ*(rwdVnS zir5TlN-oM7UzO--2=DgF6_Rr|Q_E+WGKpy?kXz$b-76kP+Oj=+YxWoBE|H%j;aZ-o zsmMcr96Q1@eUtn|*INH0g7rHAxg=f5vvC%SA-@Z(s94q4MqE+sz@V{y-2kTyuK}?& zU#p0Px$rK_dOhl8cCXddI%=RGP96EpCWjY)*~+b$0je_@&C3fmw-w_kHG#9V_CXP^ zU+%SetT^ZbwGcHLy`HVESkpo<6{G-#(5}F48OqOF^BW?w{z|R15<(#PQHsQS)ow|s o2cZc9#^~;DY+4)1`n~$Gcn2e9i$`D2sXH6x%=)y5e;=^@0jl>wfR0kFgYllB2}lgcd&v!((J0h7ut5R=da4x{J;0h0s;Sd*RwG_y_y vfF`pbEjR^}#4;L_ZZZm!L=`BLz&#q0KX{WoH4Ky95je9nG@KB#^hB@);JqN& delta 501 zcmaJ;O-lk%6g`t8fw+)t3KDTN2qJ=!l-dNT8Ew)?!DX2aWgliHee9}V5M0`{Xw@zP zV`$ORa1;HI{z2=`o5>a}Vz|SbbI-fy+%xw#+QY5Z?Q4-d>S&;YWmNgD!bBcxI3jAx z)u%`i`n$pV}($`b6y#em&l{xKPlBt;UrC(3UU2-g{7E~ghJ#|(iYPg_y zQ=S9kPHSe#?|0ksYDFeJViBjj)aIi$u$iQnt*bAO*0gl3iC?ep)@SZtA=h!1k~QrA mu~K0Y>aW>II8Vu5C{|>QbvOG0K`;3ser*f@ diff --git a/PROMS/Formats/fmtall/NSP_00all.xml b/PROMS/Formats/fmtall/NSP_00all.xml index 149808fcfdf265dcc0312d30aad3e116b994a60e..2aeb2ae297d0aa1c1d99e1f8e3200d92f34b02fd 100644 GIT binary patch delta 71 zcmV-N0J#5}paF`R0kFyev-|fTPD;|^HB?_|?CS(+o>K7i9 d-Z}=85IexL7Ce{?v(!ik1e4TATC-YBzycFP9EJb@ delta 557 zcmbVJ%}N4M7(J6S1Qn#%EDB^yS1k&E2D3$onV~@{8M&-MCyP<5Ns2Z>+cpJvRYCLw z5zL}}wCV?Xf!4i7XT}y4u3Fs7{mysp`OZD}>{7bAmF}M7d)2k? zpU#M|DhJj$V2_Gh-mNA(AF|O04X8o!DnE^O$*xkZPNfQLaUKkXigeKSv`uykbY}mW zlogwb-`8W03x7~{E|m9>lH=%>$Y|Axjs4;!_3r&94 xTl#urvdpj>a6>K;Jo038#4!gQNyMNFtGMAj=I?x3KWYLAQj?fP%CU-??+XQHcRK(8 diff --git a/PROMS/Formats/fmtall/NSPall.xml b/PROMS/Formats/fmtall/NSPall.xml index 85a5ba80ee9e753065c3b0e51628474f4bd357f6..c1dfe16714eedd86b83ac04e3ba950d468848ad1 100644 GIT binary patch delta 331 zcmdn=n0dt|<_-54Ckrs0ne4>8ZnF!E5Bua(p#qcb1o$Q&<9;()jaOjuJsywA+jjCz zF5~T+{EP3@Ccz2JoBxO`;F)|(QEhUFm&W7+${Lds)TAc=GvnCYr^LiOna@~(*_gq2 za-f$sNOE(6+Bvbw4yJOGFF3JG4zu@|e9qHpvY%ZMOl)(Qy$Cam15>cM%UO?ok|E3F zU9u9Jzj?W^Og>=-GJ$RKCI15uak$C-lofON4wTh&-3err3gc#ud!Ha;lcy~ZnrwG^&gM^#mOyQI M@B*eP;e8Mj05D{WcK`qY delta 1567 zcmbVL?MqW(6hC`$GIeXZrucHZ-W5?;Yn$6@(XhQ34$HTVB#3IvW!C1#nrH?72Zed+ zyZE63Bb*m3D0%@g$S4YmK1c*bq(5F6ho_jYLaitaGVbA@Y-#O=ZUYZwBXrpJXc5JH)WWA>jF6mUO_D$R z&OslJgTad#=^=z*nlJrZ%I7A4K6Q`5dBlPbBE5*-}UxIF}P|9T4GfGS`qUo=+ zv`WGvXlORT;{5 zw%7#hIM`pbn)ekHm)ZrL8E0!=ROiUA&>R%H%|2Oggs`}zf^?8NRu8MxE;UQG6>+(y zDCwKP)KQ*w!LSjN^kgyC!Es@#GbO2K&F!LyS%q3mW-T5vm^89iBR;ij#iU_MQ{g8$ zalBg9z_D4eX{V*uvMpdX)|fF!VQkKi_jOxp$z+T8Af_>d?e%MWZ!Yj}u&z z%8m|Ov!PTGA;NZs3;c$nytf}82Lrg%n=Ri<%zHUa`E)EK5ik2}l{|ZHZ1?0XV0Sk4 zIBi^v_P~m3VP0Gcg|z<=UkI-R{}PtoUw{(C;ldw@2kAMm*Gg|xTnm4XS$b*nhoo)p zA#hw$*Dk)9yQxz&xy0ClLCY(7IblDz={Uho{<~G;^!*>|MkS_$t&+^S_3)dzL5b52 zPMNXrcC48 s9mFmuoO~UqXx@xV??R6F<=uK&5kFkfm76&8DNvy}rNRK-e;rW&1~rXwjsO4v diff --git a/PROMS/Formats/fmtall/OHLPall.xml b/PROMS/Formats/fmtall/OHLPall.xml index 1f1a79cb577acbe782f6b70040724b0c46c5c831..eb95d12bcffb4fa2e04be3b61e30f599b348c256 100644 GIT binary patch delta 247 zcmdn9mF3uKmJM?lC!b?9+HAzc!8lornQw9v^R>x)(zrHPv3M{}He(Z*{EpRQdKe2M z-{dy71Cx)iFPkjFSv8q0Ph|52PMfC5XIKO#J4{rYysK}*twSjDwEr$+?mXmthD*m)Ke^z9pZ-bkWmP9~b721b%L`ZQ-;6pW%6nA(is%9>%E#(p@;%&4`nENUTz zF@B&eBxo&x@hCxD=%z)B{(vx|U8|6aN~!4F``!@BD~8A1cfNDacka30d$sIZf8knL z65P(k1)X%B#%P#gbcT*`WY@z>!lC*gP`*NG-qdzS++PU;)AAsUAeI%1P_KThZ1xgTy4e=%O3 zFXLT3&l>=i6_oDNN;Z!D3F^V_Nj%CHGDy+{pL9QynccSRhR`DlJceHa=HzjZAvI7F z`SD+E*RwV2SOZ|+Kqtv;R4hv^xJS*Z)Nd+CeAYWGTAzw439`I1HA;I9x4&+Wg%twl zX6iUUQ;tzo!(yY;j~aMoWuC*iZr;vRbo|$t3Q`VYl&33Fk4OLJtj zQj5*_`a`R7(lE$}1bt+XUom;|UGai0*34Twhqa?lJDR{ZY~9781EPL$#v`7XGrvwa z^9}G@$iFJ`MVYp`E=1wKoEX%GG4xTZaXNMop=llHmZGR3lUIjMh zWPUBj3Fel@*}z06HmhO$JYk`BD$JfXs9|9=!baam32Hfn{WBSq`V`pFZaj{r5g$m1 z9OQQcd&HHq1@Y0jJG>AJONb6>ym62mCwue@*7 zsnkxp>TpNmaEBHCarNYByvWXRJzta$fqK51Z%s-aP{(`NUI`Jt%_i~dQ7`_j-ox@; z7vJ?D>&53{Fs*ZArnd`LQbWC{bK&79`8c5P-t+ErkM5?!xlv?1@(^|)|D#XUK zauD`(7>WBaBy0sAma=@^4yo9EU|@D;5bnAO*SQFLC4%&%f?Tej|Gvp}LGcV;`_e-K z9#pLp^Iun4@va><3|?lFxLK`Pe&Yf)1Ag-|t;>#Z#VL(a#Ggvhgw)Eu$W_S^3%~vN o7_GIrk)g#lV_B*l(b*oSEoXm>c6|2+_0!RnXzsOFH}hoE0rcO_Z~y=R delta 2250 zcmcgtT})eL82-MVLm{)n)mj;}rTl~m0kL##sYZnYn}iHXXpzJv#E!C2SAnK=@{@Qkr4c7XM=2}noT)2wD`wTaurn9{@_tzw;Q z42W@d47v!=Gc1YIL7-E(brRah!&r284Y8OyQhnQJf@PzKzgra*b>}R_veAyRPCDUlpf6ji z=!UnHvMo0X$los@dxpNLj2)+2ip_uT z4V@Q5Z^*`#jh)V06|(g=`eu@)u_jz}GchSX3HK}ipE>HYn#F68zs(QiN6|9upmwK| z`g<*uJ#mDx!&!Pc50XW_(* zVEW})=zS8yXdK^?x*=>C`HjNogkBk{6TdF@S*_i8)fZ51PDRUdh~F=!mgNR<_Tt`c zRCM;@8G7OJ{5BUKz7pW{r)5vM{IWGqll1csP3}Ut zR%|^vltC7hly@?BgZ!=kq`Z@P?kRrSRM>5u*4eKUli*V1ONa4 diff --git a/PROMS/Formats/fmtall/PROMSMan2all.xml b/PROMS/Formats/fmtall/PROMSMan2all.xml index 166feab89943968b496cc4e04ca21674cafa4de8..328704cac3fa0286001fa3a1fc89afa877a3f437 100644 GIT binary patch delta 235 zcmey-$9k@fb;Bp7%___~jGK?KNa#;4+by(N%%p*7@|+;9$ve#WHh(gEz_|IHg&fo7 z9o98`lU+IsHXrcn5TCp+PHJ;g(mw6UYx<-npX)m@`9Ublaw z$3nTf>DN>km8RdZVw|zvN`bL~Wjm1H#Ec}Wqsdst0_U4;SI}cz#suOoo4&z>QEdAH sLq<0Ue>;#r4_Qjjg0TS1SK1D=Km}szb{jiJDOR|FGq&rvF#0e90L=Yb`2YX_ delta 1111 zcmah{OKTHR6h3#-1Sv_4EgGyulW35nAx)ZR1+{HR$)hH=2`v?b#w6ORO=A*jyYPVv zL5U(BAq%M%7u|>;&SDlKS`cxiKfo?r_zSwK1;KM?Cit2n1D8AJeCNC8eCPXgTfcQ* z|8i46N50z>hf}ZsB`CvjaG*cXBW?;FcGLzjn1upV-~y#`(12yQOt(=2*B}mybg#j3 z%N}4oxc#)#Zi5V^8WgTWo^Bk-|10e%o-JENcZae6!0*f>^hWI$KmN#B9=iIk>j78HaR{;Oa-dQ(K%0z3{xv{!p=bhzlU7nR_G(M z3{&7Dk!B!EBQDTToZ2V8jvN+nDQx7T+)xrZVk#16nZ63K@j?!cfENbj7nOWFr;z3e zy+pmqv@%LzoA`rG$$E$%Bl>B&ZZ09&0g}7EVde*zhlMo&9#_z6Gbu-%{uT(+9`VPecQb!LBDh4$=SBTqG{zM`!|fH6_;3jvVCoDmR4MnEt#QO z)k!V8lfA{Y7u~Icee8&I#>!G17A>S7BCT;BdoHCMY(vl_8<2=Bq_=C82f+`6WZVF$ z8I;D|OsCtgg^Lg(%pY2p%w9Gs9MT4bAWZHfs6^1D?tdtSa5BiM!cN0U>tUAGY0o8# TBz-u>ZtbiM*HIFN*qH7oMsV(< diff --git a/PROMS/Formats/fmtall/RGEBCK_00all.xml b/PROMS/Formats/fmtall/RGEBCK_00all.xml index 06f64338f7747c7ddadc19d1c509c43f263f0bf7..e306203d744d4f4380aa4fc3c1bcbd740cbf1777 100644 GIT binary patch delta 184 zcmbQTi*edU#tko+CQC63OnxQKw|O1&C8o*iM7bvC@o;Ru#3sWy*?^;L@(YeVlf}3^ zCNE&-nOrBuHo1V8WpfXgAKzvx$u{Q6GO7ZbKghgenrtO$u-Q*x8Y74?*-xQvvW&98 zWHnE|$sd#+O`fJ8F!_Uw#N+@Ch0Q@KLDFEuCb;lSj`0!O%;yls0#%_ld4Uky=F{ra~IxHlS&1vTZ#!*`+B>Hp`ks0t&qf z;$_667r~=e-c5=>Ku>~4e?YGuy!-9jXd%ZQ-tK$zX11Na71r4jZ4Yz_R|xIKj3<83{i z?c?OqQ)Q6M2WNo6a z4^uN01ax_9Ws6mWL^QS$==@JsN6$Ub6Tq`4)4DX0#l70m**C6>%+gLAs1ekk@(Rxv zn&R8#cd?6M3g7suTr3pje0cxsic&C9{t#?5!Ej5e!9r65aBqXZ62^xnu)6%IW?*t#3VAYV9lJIiO?m8M e%AuHC%8TudVsdd4{5bLr)M0!kVM=0b8}Yx;&CTin diff --git a/PROMS/Formats/fmtall/RGEBCKall.xml b/PROMS/Formats/fmtall/RGEBCKall.xml index 02f3500a074c45bdf57a53fcf40cffa00f089fb8..b8e6470236b30e6b128e5ac254df2fd2886d0b9a 100644 GIT binary patch delta 248 zcmbQXkLkiDrVV{;lMk>7Oui+f+jFe_E3|X ztQW>M+00&JazH`ZBxSqF4PqRdyTWVqH!HN?V+Il`jGOIxl%T8y69k~FPg8C%L1g)6 Mo`ACC=Kf#=0J&FG=l}o! delta 1342 zcmbtUO>0v@6uo(o)M_JDNlH>ezS@OKNWaolP_#`G18F|m1iBN`q$JuTjcrpcE<_L) ztybkqanVh6=PEdB1wqk`;Gzq+;tz1wrFdpuQc<6Rbn%k+?mg$+J7?z3rECYXcP zO=#tmx>VM&4Rp3bReaa*FXcisNW=WVdN!cz%z{xwu8dyt3ONo=9MKYD8N`+(n~!g} zxI23!oQ6^i*(IesfgbXREYK8UH6Ue;9I_3(`^bY%Yrw4WW2@u#?>XsSt;JjbzPRs4 z3j8WOnun5Pr6`CMNxeTg5p>YN3fg<|SFU(x9W->4nU@1>L|bN*2@-rA4}FvfzL! zrsvvm-LRI`ywl?rd&i!1grgvql?w%fHN+skh_z%?k=396uqo>h+xGb3g9z}pJ;qIc zT-D2bwnS#hFo(iVGE3QnI zHNNb!yZ))qZ!VTZ_oa2M-xyX!6D4TM)11c?UU!AL**C`D`|fil`AGN@qo)6-icHdT zh|6{-Z%$kIS;Bs_J*QYYze@D0_}hdNcYr>>>WJ`{bbtp=K8+anx^Edy?F70lU`l>9 zbr$DF-UgTyF+KAkD0h8Pi3X{$QhLdUpo|7a6Sd+d5 zkh97L1SGQ{E0hP5ATt`1$}$R*Of%e*f(#C z1UG#_tJV>;h``RwvlbyS%y8%2bI-YR=V>fP4`O^PxaajQtR`?{fOJ$r_Bnb&hQG|0EdkUZqkttG1W#as- z-3KyMr_&jlMO91X48E`*^1!|ls-Wr|@)?-qsY%ClLc73vz}oCC`*>o%;g+^6ACa~c zDpaAGVt|86=^%SCu*0+54{r5Sh1!s(3Eez!I5$R1{*ZjG^sp3VEEQ^W4evI;Eb83V z@66BWm(!srJT=zVEpmwlDC}W1Vcnn{&L$?OTHrS$${$7$^HwOkW3SnN%~aFdu&vSA zpLX^!45=)q{~mh``bwBzU42&(p!EYu)3X;9=A@9!Hb4*aRl` zuz5@tV>j7+j6J}3@&OH#$p>8BCV$Y-*?iCX66<6cC#lJHPS1c6N}GF}J(xGYa^4P(adS$W3mc4;!Mr(Y;w2^^_X||4X3h-|7pQK|f^$&TnkDa`tQ#wSF->-xa&5B1 S#)i#KYx$T#oXrj!`1GEO-#&)r;TEZanCUhZ$zx_r33Z@6CMO*FGL-Z=P$z z1!~Y5d6Xv`yG?N_&;s2?)Zx8}DDP+|Ci1vfs7)?dZMuV%1-?$3)Im;%F47pKXpFm> zorqHjY>ynoYdBrOl6SWs<*Yu!vB)<=qAlKAInKHsv#x^gsEiinfVjw6!@h~=f>P_i zT@$A)kOGi~s#}8_aCk^>rslzrj^SCSnz(?vTs9Jf>x2u6d|Y1*?vnzo#pE+W=k# z-UbVq!8GL*O{{o;_2a&a8kqOU|Bv`#nwFtd#L$iL+T zcHYeuBgcxk`lIudV^jRhWiLg`m`X#ve+h)U3QCFI_T+%L{wP0~2*ok43|?}YW@)C+ zU5yBH>$4UrnD$A@r=N_WFu^pXDFe=cJ{k_s;-Ak1q$3(v9>@9Q&JR9)BgtoX--c>V p!=ltgBZpsn5BFt?-pg@4)UwIF?Jr#FJ{0S(jz<1X5vA^y_6rtX-|GMX diff --git a/PROMS/Formats/fmtall/RGESAM2all.xml b/PROMS/Formats/fmtall/RGESAM2all.xml index 364326709ad960aa311847de2b2454019d04b906..3ac5fd113700b37bcf584bc2bbdbcd984540cd3b 100644 GIT binary patch delta 138 zcmbRCknztg#tjWjlQ%JmO#Z+WH#y6eZ*m{=vdKA;T$96CiYEVISvUC@YsBOPHj~W) z>})2J7dfj;{=+6RIY5kUa-NXDWH}qY$p>s$CM&oKZC+vR#5Ot1NotZ4*W@OrJCg-8 plr|r8_F&$u;(kqR^R^Tf#?2P-39LZYALh;1GNf1_VtRQQOaMxKGt&S7 delta 737 zcmah{yGjE=6urB7sAVuwe6cYiY9S_Z(L@julSqn~#6%Djk#)29UNu=?SZHf01O9-G zrLtICTiPlJR{ny8h-YS_g$87pVdma*&pC5vKAxn@SLx!D~T`FNc6bvfGz;Wd|jpX2kGw0yW1QSP=an_)0iJgH;t~!bu6;+D+ zHsE+FLBBvLRBVYmJh+#Ko!C6sDyUxrgGSrnO+qD$=qh4G!ETVr_A&uB=uwv}Xq17{ zQS-M`jzSp-9j*)vv)&c%D~uVe=f2~Pi#Z^V$YK#!I}3Ju?FCP>s_-Up5{H!UIf+ik zFlAE6*5Y?wk4Q2l(bea`3U~6>dx6n;w|-$3>;5EP^Zmb zM&{8U{!a{aT8sDFv1Hce%i`#?&Ju3J_DTA=El@z;E8@lS05~r@ZqF{BdpjDXq7)_7 hel%KS`$d13l*X8Ge6O)OQgJub2t#8?vi+ND@)s2anbH6N diff --git a/PROMS/Formats/fmtall/RGESMPEall.xml b/PROMS/Formats/fmtall/RGESMPEall.xml index 3155d54beccedf77ab7ad928e8a075d633067716..7342e7e616da1fe08d3c9d361abc50ec39480ac6 100644 GIT binary patch delta 93 zcmV-j0HXh-uL0z#0k8xElQshslXL@KlWqhGlMV!`lROv-liCDwlYj-nlePvBlWqn` zllTTSv#1AHSx!E z$se9P(@dFcVd^dbWhlpH0-&t>cf8(1ppWm8gM6RtYWeOprbhU+t(hZpVeVZlUUf#z ze-xt48EDPZ){h=mF--A^T#EX&)Qj3W4^z&#Dz*9*vp>{fVJU@RojD}Pwa01PzqD-a E6T8ui0{{R3 diff --git a/PROMS/Formats/fmtall/RGEall.xml b/PROMS/Formats/fmtall/RGEall.xml index b68d68bcd1d2abcdf6c34f0f9f4c5e8d19f24135..c14f6c8687d0901c6a7a68644a2fa6e36ae6146c 100644 GIT binary patch delta 197 zcmca~o$0^@rVS@pCjVj)nQXxtH+hvX-{fno%O>*}a!sDcRy5g#ecj|V4uQ#X93GQb zaF}d1;k;!$`G7RbWIIKJ$p@@BHs{zrV4pn2Rb}!M*E?W|IB~hn8tx}pHnaJxG2P5I zQ-yK!ho%Hp2y0U34JHU{Q|}ch>)gak5Y}X|RH4ZaCQ5A`sON delta 920 zcmah{OKTHR6h0Xz9mQ%N7;CICAy8}=LNc8uhN9R`5-QZBw1F;d%nbE8E$R5eMclZt zB9h|+q}?cjJ6om;7b5MZbm5|OBf>1YFLdP(@Vhf{VHt68FZc1i&bfDeTiW>{t!&BB z0vU9ZY|2v=bCnWQpsO@T2G4c(@TPq7Tpqg#s*?pwo$h0dfOCuP(E=C?bdi#jrX>HA ztI-6NfVRoRc?GK?hS*!&8|&j@_)|oj&eJ632Od+S3*hdB8|iVl3&nBdv7jK3Q`lGG zXnQLYOyM>Njt16j+iJwmG6~-@>0sOu2<}p@@hPP;bEmQ%UI zkn7~#;&D!#ksWvVo1*)KGWutNR7VyAD?v_SBwB(8@Bh4xhvV1!0Kd~uAN%|C=;--o zrP=I|d1m;m{-1zw8b#C^-9AvlG&&>xf$0^|=X}j?$z5aE`c1R_s7~X`>QJPNE*swa zlmPJGame}nbRgtZp3H=!LHB9OPzsok91pryDT_~(A(b?Mj!4eh;;+y@kSgWy1+tX! zEx*6mk$QtPHMBO@Lh-BX-OaaOoacN=3e2ziV*78Ng?oa;GF~uLxU?)C3ba#Uhu`e! i@Y3=wuPt8YeNJ-w%N1UK+|TX@H_%$N1;Xw}L;4L*I@xjn diff --git a/PROMS/Formats/fmtall/RNPAOPBCK2NHCall.xml b/PROMS/Formats/fmtall/RNPAOPBCK2NHCall.xml index 35bc74aa3ef12033ec52aa869718b89c5edb92d6..d97fcdc876efe587d5576529e755274ad9880b83 100644 GIT binary patch delta 148 zcmV;F0BirkhytGc0kA9slU@Tdv%&*d5|dUy5R;k~c#|A543kb5B9q*03bT?I0tAz= z8zhtb9T<}!92}E=9Cnj#9d46g9_+IwAmR(NNGucxlcG2xv%EB@1CyFGBD2Ie1|^fg zMKrTeUd95GkU4~t%w)*3x?(l~laM)tv&>|)1e5G(8j}uc)|2!qB(qLy{1dZqf6@eT CDLh^P delta 1162 zcmb7DJ#SKB6h0KJjoPXZY5)oSh_p>?z)DMNG^SE$hZe9kK@&|yxTUld2p?LKPK^U` zFeYbkFzKL+TdUW>wGPI~IO*m`;t!C$gU@*{#E>*;40$j2p7(jqdCu3)f$2lNWACDw zx9?iJ!?ZvJN|Q#{Xn-B&aDN{~VX44UrdxQ6;K+BrW#xUBTVFHJThE4I$}4gnV2#pz z({AgABM?heg=K(acDtiYG2rGYi|4xFaIeuORk$(J&mZlZ&7gS-<1UL}NqRszV3w4S zB9*xjaPd>`3I4j-{;73xkIQQwqucz;ZyS{2)RgoHcscy$z{}AJl&&Zr8UEq7bHtTDrlJb# zxRfwQHGbiA%(j&nWsr`w7dQluRp@N>GK#Ma6jeiPVMobF)4c0y@O{TAnFQW)bd4`j zO6iyUjfx1?kJE>I<*sEns-f!0yBQD1hb+M&Fd9%5&u_? z&-W%w|3lL2%kL~9Lr4tek^+|00IGFuHs>+3^9dR#lO^~W%&vg8GHSZl84CCHWa#6Ho4 JK3n@{`3uRb3BCXT diff --git a/PROMS/Formats/fmtall/RNPAOPBCK2all.xml b/PROMS/Formats/fmtall/RNPAOPBCK2all.xml index b035681892d2cb325935082c35d6cf02be7c756c..dc121fd785426e588e3037eae4ce65e3e07d519e 100644 GIT binary patch delta 152 zcmV;J0B8TWhys-S0k9kclTHINv$6wN5|hS(5|fM;c9RS;43j<=B9qK*3bTS20tAzw z8zhtL9T<}k92}FDe-4v;9B7kX9d46Q9_+IgAmR(NI4l$hlae?hv#d0z1Cxq0BD1tO z1|^fQMKrTOUd95GfH{Pdyky9;s$w<)lYlvdv%F-q1e4rp8k7EM)|2EaB(pwi0u-}m Gf6@dh%sjsU delta 1148 zcmb7DOHUI~6h5UD@j=w$R6C{VgV=(Rv|@QJ2-FsIfh_@(ijR=79cs0&v<2IZai`J5 zg~vS_H!Q_5#+6~|PF=Z`#6RHP7{4>qE=ZaX7x&KGbHDGL@1Do2KekU#d)^J&xpv#x zKTp@FLOIfDhJt*=J|FN?3YG>eb-Iqf1uQw2J67KDc#WI(MdzsmOl6Z?23V&Y$CZJ8 zI0CUo8?Xdmma#t+*%YHG3L2}f6OJ=+IJl3i6hex;q6vs{Rvn47gCe+u5cd{( z1L7N0!nusEI2@yKn&cgTF@yh9n)Wb~X!$Tm)Ccz7Cb^CO^+#qY6)W%7@H|!a6KTD^iP}tL`iNl1f&M z_NO!fj~md~sa^`F64Iz6wy;wap*U}Oe)E$1xYVAD?!NIA%9`5c?N&Af8^!YDt#a3~ zTbVF($Xj_I&xIY6RbX_W8hAqudlDL?czzUHiX*W_mo&#R)+SUy70T}8*G`A=V(`~7 zuGyU4PMs~$3!qgXUYvr2hVvPZhkN_DVLN#MbT)R$*p6=74~81EvFUSsUUPY+!zGZ_ zFY+%r$f9BzYWik4!gHA^V|Vp^kHCkz!%G0?;Y3)$nq%v45|Dw_bk!<9qnhE4R9H6 w%3@;oCnkfImjROLz7-A|b9&F|KpLGYV_iXo_4Zg^gj^X-%o0r)Gp!$ve}i!W;s5{u diff --git a/PROMS/Formats/fmtall/RNPAOPBCKNHCall.xml b/PROMS/Formats/fmtall/RNPAOPBCKNHCall.xml index 905f6653d9bab08a69c8b905807ee3f2198e256a..d9537e6ff8b099c480d18340406506279f28ed80 100644 GIT binary patch delta 358 zcmdn7jCs=(<_#}6Crfd~ZC=F{BQ*J%p}^!U*^0?N9(SF7HWyvoxzou|=Ej1-Ky8 zlm$(h%;oJfd4jpfWG`QV$;*O&Y(5pTh7nnCvrzaZR-mW^<7SSy4#v#~;$N{$7D$)a zl&Zlr*}>jpGM9(gw6#&&Ow`U;TdO8Fab~S~|7gtOZLDrj zr4OQlP&{Mkiy(pzgF)@>Rv(6nusuy=4}!i(yQlSW&JXR2b)f zn%&&BwTAb4)>jI}92=LNe9ZF|ubHoERhHK$jG>a$jp7-{&rnRmsMP~cijTydE)&)q z_!{7zrZA!kXY(UZ!1}{;Lu(8J%t=tvK}W!66zFzNdjne&NIH*#2?bXKv!led3Uzjl?ITJf^W3s@IF{aV2cBgiE3HC^IHQy^zP;#o9kV@@S3XfKA@1R zJ4F%LvV5lB+3-0$a*?)F1ptni|Z_@>9H`B?KiZ;kr2)p;dtnubtwG3gB3>Kz5fA;k{- z3VMk`A!>t4(rUK9=(F`wO7oG^UTfIjU&p`b8>$Pyt)GI=DoPCJIy=^s7_RT1*LY5E zDyHyb-DM5-PH7T_L9)9|K(w^Z99G|UxGaZqB&AK;m zQ5{ueYK4x!tY{TU?Y7X>oF~yJrdkgsuF-C}2y7F0GKD2k#dUoNYx=~3#!X%8+_Fog zBkensci}mNo-lZEyNh#eah~a3$J1Ze^58C=AEYDvMeGNzNj{bQkIU!F!jbhOQ(|y% zEw)qJdY;)b#nTg2R}ar}OX_{nEq(Zgqf$ZU`?_nBY%v+&m||*zgbZQ2IP-5Ylhp?rVgQv= z)1||BP5}v7#(Y4tUd(1I8q4{&(>6pbIm$XaX@{Mj{dIYTzg&8d+R>(;$XcRKJNCkZ NrxovlGWGk6<6pwXqWAy+ diff --git a/PROMS/Formats/fmtall/RNPAOPBCKall.xml b/PROMS/Formats/fmtall/RNPAOPBCKall.xml index 883eecb6ee1461eaebca57b7b14b420e0aab58cd..e6649bedfe9e8b7ea023b0c1b1c61c474b441c33 100644 GIT binary patch delta 353 zcmbOoTj8O`ID;H$ZZH#>Y~>>`d0Nnq&AWovFd_?XW(wQH3KW%K-25Y^gK_hQxK}Kb z(j+#2NY-GQY+&ax`Inp6u3T$}tL&TaAqEuYB_IlCq|WWo8H9dg20 zCTDo7Ox_TuF-a?FQklf$1L1O$XXz+y4l6q2wAt>Y3ghO4ZFwvZ7T=x&Oi63)^^dJ8|3EV_!XGX4uTH1*IC3ew}zgF3D@D#{0@+xTPel~;oF zGBQn2O98zAqzODF*v9ZZ1Tsb78z4C+)Zw*IJ+G@s14W7>cL6ab&1x1>DG!7t{wd_; z?(V%D@f~cF7E7qLNS8HEA03Afao_9Q^40FJ?X6Z@0IJk5@GRkH>aJtJjl+}USjy$G zU@f6{6FTH6hNub;zVGW&U;A!3+%XV)10|DaO`r?9aD*rQUC&P-=?VZRG<6Zrj=l(> zvWAqlrQu$RQa@kyp9tGX)5yrdH(yhH6xKP|(ja63t;ju_ZvMb zYsyS(zXCjXjlPcw~C+bzdj9k*LM(sjX@9JqEuZ*rpe64X{>}@grrJ{iJ z(Fuz3X6O`eowHPCe7FwS52siE!Kjp&siCPJ7@yY|gg2KG8TE7OZsX(Wi0p8v^{EwI zsoJIr&HUC77Cr5mNa_neiz%`6p0IF+_PixvyM(8px5XcwdsXCIWEVG|Z1>7Skx{e{ zPu``)EQZ14hrJ%ogwwn>*v{|1*39XFByZ#rJf8f3f6r`7{?qmIW$VZelIvk|M~fRc z2YKz8Wq!%p&A*P_WncDx<*OI-x15cdG~Y2iowCg2?xu8~7TS>em#<#;%ANkm2#KtJ z8;PEo@aoZ7-r9VMw~jVTS3~u?(yE{*8DiO&SzORs-KKH5Wy@jnsrw5%gKa5r%ISNR zgwbAV{VMQ9mxI4E_H*gpnp$4}#_6sX_X73mNR?CH?y4JcjQS99xS^w7dJjb~s>fw9 U(J>n+b8oxhKPahJH#eMr0)^C{VgLXD diff --git a/PROMS/Formats/fmtall/SETDEVall.xml b/PROMS/Formats/fmtall/SETDEVall.xml index ff8246a8df419a182a22555242c649fd5e10502e..7ab0cb437d864aa9ffa4e75669a9832f89e0649c 100644 GIT binary patch delta 100 zcmdmRknz@T#tlapCx2rsnmmh(Yw`gumdz`eOc*E6;^&(DkGXB~ES7nbLs%mwzhj-S z`4`(3wM}|c*e97uOy6{AHB6&#{LRLU|7v$Fr8q59S!qG%Q# zv@}E!(c04BkYi(OLqy+w&l*DFaxeFubH4Naxa}LMbtknRB#QY*`x8iF3ne-mu+zQN zm~kV;?*_`)L5^<=yv4iri$>sOw16rr%J6ElrnqDi(rsk;+=mbZF$XX0n#r1EX_J{0 z(mJD%S-!AGQNnr`jdN60=K^#tuh5k|;>>c?Cfi3j$s#IP#Tu3vt20)k;jE3m!v6mPO@YBNhv-)%F)YPhSQK%9 z0(qRalhCEs_J8(Sbe=k@W71HjvByz$UKLJUMuN`@&rL6Yo>d>csN+0s9i?~mE&fj? zE?<-!*JPu}12FNBs4Xm;i;{GJ+7dD*7bU4|{*cPSI9-pE zk!|v?#3Z29EXK`BDN`7sa%B+4f^-GO&A&4KP1rt-mr;drv&-*gEZetfFsds03NPxxBvhE delta 1393 zcmah{QAkr!82-=QW+Pl>Cbm{NQ-YgH+tg_fR?}GqxtSXq#Fnh>rlrlX&CDc%0w1Cm zJ%aR9MD!SgEAG{Y-hv)`h+YeVu$Mrv9{SEbGZnAM*xlLxfB*M?-*?ZaFV?r;tR<_Q=nS9VsMUQ+kU8BHLb-@?fucBF!B_mxa+m7l_SS0s zspXu_5uqF)X>g`!f~V}YePE$k>Z1X=N+Z-u0UE}ZX=CdcPQ5^;X&kgUndZ(OM5*BuvKamr&PM-e>l10DcL#gIPZc*c4H@Np0OLKKFA zNtzIz$Rjub%%VGJ7%G5Z6sI9z3I?W~{Cxe8)+T4;P@93-u^p=hP#r~W2-A6?cFAjD zb$a6PB70IaWQin-o07I=EVV?ymNq7ZQ>k@JpX_bcrH&}JJOtwwN-_=aU_!SVCR+(6 z@bqx+>3V(b$n(n$;-v|ta!Q;9Q<`SrAd9y>+t#2j-Y8jZ27nL7Tul-hrUw|y<0FF5 z{#!DH@Jlh32V*A=RI=yE*vGzoR&9InJH^BisJM_?MNTljY^@o5mhfGb8L4DQ?Ja+Ap4%$o6OGmqjYvRq1eSs$u+)_@pWxo{W}n=A*TpU(QRBP z;U hfZRXKKthFab5GGHCJ1X^*$pV`Uey~Yi?3dY2>>=4Hwgd$ delta 694 zcmaJ;O-lk%6umQy_Cbr%Oh{tHh;R{UrBhUphEWSMDsa_8RQfJ4>4OTYP0NDoqD^G9 z4x)j6LA$msS{6jB7SXnd&YPEuLgF#Qn|sbZ=iEClA4=&!y?RtQ+U}@{QJhvOLs>o# zxp+vm^RsfSdubfi0%d89rg0m=BfeK;mG=joeB!Ay_tYK5CI~rB#hsmFLI|V+MQMG*fDZH0~Mj#mjZ=MRg>(KeCQDdLB&=3c{Ns};6SiN0*s9m@tU@rVrhvBni zVF7Nl&2&g^5=t33&i!&2MRgXn38>~pCVpCR@qz7_y;_|ZoCmb(&=jRDRAiP;B6YyZ zEwOT4dQC%VllS{|v)=yZ=eMS&7O@#&Aj65fkVw-OjA2^q#(*XBB=BjsSrk4sJgt(P zpmj9nal{1K@>YH(JTm-TG@7f*ySg;)hW|CQQb%E%ro}&TlGp_H4G$lG=(<_#{R+Ag zSZ2ohyW;>hEL+1o%lj4cX7NFFSHiogOERuk-zzi1)B}d1>6O|;*ljlj$)K>5x!rhG QJ(ZX}VD^<+_uCHj8#Iidy#N3J diff --git a/PROMS/Formats/fmtall/SHERVSUall.xml b/PROMS/Formats/fmtall/SHERVSUall.xml index 4550000aceb41cb41d5d4d19ffc946ef2c34017d..66ab43c8141d90a0953d980740c2a14fb3855178 100644 GIT binary patch delta 153 zcmZ2AhiT1JrVZa1Cu=ZGnf#6^VsiSOg}Q_z6rl5M!BK!_GBXfi+?B zG}d{O1K1)azhaxP`5XHz&B+e3Gd5Ql{b8H@$Wm%@k0sY+5etn;9%Yk1u(M5eP?MP) vz^Am?%(}s1vssf0ERBC)uqoq6-Jt`=qhNGmy} delta 801 zcmaJ<&r2IY82xs;iUmasjZ({E3^|yCvPq)}LhFx3@t}zqA$VvoBq3IlXwy{Fo;(!s zrtqN$@t}xMN)MGic<}DukV~n5fgniFeKV6BB8v<&?7Z*I``*0SUq|}SQ~mcpjVrG_ zFK1|hHYrDWJ{a@zqjo&#qd1T%<>@mm<7*aE?8{A*H%3f8*5`vZtx*Pe0o){gp%O-h zD)be*D%K+KcjTw2^G6@myh3b?may(fI6^VX94vZG~$$y8ezUPF8ZdxTyLN@^oz1)vEBAzSaDNO%E8oHONTk21z?NP zcAm=oX~)ZFZHN5c=oIlxD77R`W#KT7QHD3sOg~3oBxoD-3Wjj6!c;xo>y5-3w_k|{IUViq zYDNFPHu)s_!+zF`yw@~rWohGy-4yb|tH6!lnTTD+ya~jelYdGapnBSn^YAUGIUSX{ z(dSlwOJT|2y*Ur3_xl~IcB{KG$0!1(X1sBe3E>68l7MEtyZ5>)D-0I?HQDfD==%#- M$Ch$DzrU*g2g~EL6951J diff --git a/PROMS/Formats/fmtall/SHESAMall.xml b/PROMS/Formats/fmtall/SHESAMall.xml index a94c3d4ee1d5c2cd675ec6e6c9bb11b0d8a3f660..f7e58d031a4d7de7b16d2d3d42abeafbe3095b9a 100644 GIT binary patch delta 285 zcmX?dlV#mGmJJJ-7GGjwoUB&Qw^@iqgOyQX@_JU$&6_y;m?lT?*lj+<<`W^tEl}niF~&A1bA=RR0hAdd$2bYf V)KOym17+r@G46mele8FHv&mo0dGQ4@`p7T4u^E>CeHr7230LG9#Uik@Na=gSH^>!TRlGjLCn4yy}~IA@Dq{>KPU9>wt%YQ;!H^(mUP zlmwv02WS@2UaP5TPzbesz)V}1R*G=uGI)ur+ZO3nO8C>8qY}*aP>}Ja;q1Rc zxz|qqZX_iM7uorZge-eA!C6}zm)F2ZGgwmwRtkHbrBU2K(Nhj@4WpjK$i?V&OmvnE zQ%indtk>X9S)WJ@&^Zebq&B)hA-af*(MGLiaBo-j$bcb)8kyPk+ox8_;;j@aBoy}8 zA&o{TT-Z_ByrW8%8x#U8{=%b^Y*?w0g93nsZJ4u+t;=B{d@JE1+t&)Vpm=3$kc++} uMc{&m<>Y)}@Li%vVYiaKaY!c z0u(7`2m!L(fEdKjgNp)H0!0%Ua)2sQ8I(4EWb|d!4FYQOX9x!xp8`~z!4M2okPDP{ z1S;|Xilzg_0)S#gK(V~Z2c1PX+cB?^c6J7ungi5W1{5v=LXdW_TNn(0wkR-QmxuWS z6sGeIE) u^4Dqk_j2O?Kg_r=pAW;+m diff --git a/PROMS/Formats/fmtall/SHESSDall.xml b/PROMS/Formats/fmtall/SHESSDall.xml index be4cb63cb52b02146874e465b94f4672cd92b04b..a15aa6f5674ef1905b629050241325a3698fc826 100644 GIT binary patch delta 191 zcmdltoB7ye<_%XEC$lk4nS6#RVsj9)0pnyHNv_FDSOg}UNQq32V&|Itk0oJp3G2Mc zZEOOQ?btjfpJ1D?`3n0s&B+tgW^67o`olK)j-}M(f0m~v>+vaVHn8qX*&MJ}g>mzr z1z%VoEQ94t%wX2!lu)6`8`kgGY_mp=2_iRd{U0dn-ewkvs?7>Jgjj*HT2Sr#4oN{I O7Rw!ns)#wA!~_6ddrb8J delta 932 zcmaJ<&ubGw6n^_FpyW_%*J$I`Bw8_ukgPG=3ZgYsJlI4{Ar}RgB-GY4*1BrF)Pw(k z_@E$yi1kqLpfDapK@Wl+JSiT$>dA}X!J`Minca%WD8mjr-}~P8zV~L{u=Vn;_2i?$ zU-E++CTWT;Qir(Ct)qzCRrOPypzhn61x&IqILo`T&d%$H@AYPaU3|Go7&}r<~6kMS(D)2YU^K#TeT8L;9`#jPn zU}F*nXDQ+x2R&ZcmEsY5ZqpRvOVFrOLuvSY(_YO?fH{|-HR$(Lti*ZeEbn#(ygyZs zLvsekPb#Zj>hpWy^0IS_x7%qsoWrp~6JFYI)y3+=kE|e@DdEc{v2{H5GY#ev{N6}= zBAt3x+FinKAEkc|~rt~xAC=!Q3c4tg)&{d=^V$I6S zTAxVLT{9@=TPhNvpMP-qQt+Y>SHe;P^#457cgtLcb@(o_Q%}#tpjFZ3dCv2V}FokjR z1)(N~$qTeuCP(Q@Y@QIjfo1ZV2&u{EB2K{sCr=1w+Z45qW%H4^DU6ek#Hnnamde36 zc~)WuP(+7u`aT{;w#i<}5Z+`xd$!5HQj(zR${-rt(iIptFUSa)xZOmMQH61{!|!D* z5axCjMn(lzD7%H7F@_1sR^Vm~fw8yoF~)(}H<+Qa0b-18Fj*NX#sV1of-K`C7<+*t Z;~yCNfhyw;82g$gV;sz!B0WYu768|QW6=Nr delta 1411 zcmah|QAkr^6h8mF$_i&@OfA!`nZiI@jTEp6lZo19&AQR_qYOc97tq2Jz2*Q{8 zgP?~Jdg(3UN_*8FBQSaj=~W0HddsJRzW@H$)chmH-97i5?|kPw=Rg044Q**tTmH(p zr>W{t5B1U%Wl87v{Z3u@5cZ%clrfqd4_J2yAJ>uE zM^UJmqMS+K6Z`^CXECJ*l6x&5f=>zCbQdb~7@VukWpwo~Yhek9(j36k_=y(v16BWyTl1AT zzM1s$t>g*Ees6uUo;MG^3I9jRo<-O%Hie;zRnaZETZ1dw(Fi`}ysgm~YiU2@g{m_C zX()3r%-7Ohqc&q_Je?jt7)JIhrgVdJaYT_}5zZ;HM2OdBzVoGQpfiq*)G_c0x`s!` zRO2*D87!9QsDO7A2a&^ph=WOB^0V-JjP-2lNn;d&ta%su;FJsRr*qUv0jzxxR=aU( zd%e`D0tSjV8(9l8s(&?<)~EpO6hO9@6|a`CA)68sqz(!BQpOUt<0=-v&>}&x!z^v9 zQ-gefSzMnTY()(V;3D8c7Z)no+md<}5j3OwpjDAKzpr}k^Rm;$$4=Iz=Ij9H1qw=q s-)h-Yn{rw{33z#u{Z#YpXfuaeTy?W|{~!`$f21jkSVvN9@Um9zH&A*lv;Y7A diff --git a/PROMS/Formats/fmtall/SUMSAMall.xml b/PROMS/Formats/fmtall/SUMSAMall.xml index 90c65d37cbf144168aafe14eabaceb99e06a49eb..4b073fb5f1f19f68edcf8eab19314656fadd820c 100644 GIT binary patch delta 371 zcmdn>hyBHS_6>E+lQ%G**{sIO#=JR<;|lX+7Xg9Ibvy?cH`npmF>Y27Xkgr|AjHx- zy`z+oXLHc>7`DmZ=Bi9~n|E*Wg6T?|d*+{Gnar|GW%HCJQH+~emX$FAc~YBKEq4Mj zR5q)v^kLk*X4Rq7+qW%aRAJn{rkrsF`}Sj}8PyoKPibI$#ts$V(aD&=1{IH*$e6?o z75_7pQ3b~KIKjxmIQ`aq#+2=6W-}gRgeti7;bO@93PDW7Vnj(QLc(s3$?@i1qKBf|2beDY8y0AcFDlNaD2>cZ(H!2L+N zfpb3%#oSLhv&4tvbp#4fuO5IX&JptAB*W!Jf}X=2=xB^|ab zv(=6Mu2M6!HK45?u*en5VtpSt+tP?YL3MzE$Izsz)Vi(AL%umDDmrND{Lk^ z67CV-U9w5X9(*)ePT?AYKRPKYu1^C6z2%p zM%Z#-b!Phv-xl(WP?f0Xq>3%>FVA>TIADa7d#R$M_$xZqQI44mmsO@M%k+v%lOxW} zvE6u`W!fY#K!R#!}0*W*)Bao88H1VxSpJY<%Uk T|8=BVxcDa@Opb`Iadg*T3Uzpg diff --git a/PROMS/Formats/fmtall/SUMall.xml b/PROMS/Formats/fmtall/SUMall.xml index ffcf2e3dc3559379bd441d0167c6226d14ca6daa..6b2516f8d744bc187f035518aea7ed7342b2f286 100644 GIT binary patch delta 415 zcmXw#F-QVo6vz4B9bTA;gfvJv#Bnq^i9>@!+~_0?;vfwXjS|ry6%7>@4b~TT4QCJ@ zUP(~!MW0J^q7V%wEk#pNNH|D{Q=jME_T#<(d;kA?dw=rnw|t`sBqU0tAT$iMiXa_` zeSuEP&mxVFKY?l!Nzk9*Ht1(a+NA+~#YaBO2stqQBv5`Q%lZsWpFK*XVJkFS$-;qO zD-F`LA~au}2T4>E+ObohtCveH*4~5y7GB4NJmk*UsB%}tqHl;Q$W%SVN;PD_{6`qT z9nnsph%R59BIa?ljJU`8IW(7vuQh4#Ej>1CBP_UsTQw9taq1cwhgGmHb(eEqsH5xE zcka=1V)4w}RDyB156j4JAj!-J T4;SW~A8?L!p?G}U$C~gD5s#!L delta 1586 zcmaJ=T}YE*6h7zMU!@i$V$*C^T8RB@Hcg{I%c7vtoMbmeYpz<^GF|yYR8krU5%N+? z3dFFIE~51XUtNR=U4&iqL)4`=L3mMENf$xT^M3ml8Lu%m&U@bHea<=0bM|P$)$_yk zpjz{6p+<^OjH)S!-yr4F7TQTCkPXvDS}J_n_==m<(?u_nW#FS7mA+*P1& z0;&zg!W6b=6Z6uu^s%(n>!@qW~c>i z6z70Qq`QlEnB7Vlb^v+Yk~9KoA|RA9$tpftP38Lc^lsi4GdrF(++Q9f8w+5j5T1td ziDE9rd{YGw+>HBn9nPR_Hd~*Oe!0p zL->Xd*jU`c!!9MF zL?XV%k!ejU(}r{GlQ@hvr*I?)O`aAmFxf@AVsei+-{b&Gj>$|i5|eeDxi;I#u(3>z zQ&5?_O~GWcj$+wl8Ku0*e9CV&Ur~9-J$ajqz-9r%1st2-S>9s?5;csQ+w57CCMTGC xZB|Q~zyxFnY?ez6f-!6uH;ZJxVV<0mD>b<<_uAxj`YM~xB^1dBnM0=9wI)@VW^Qcw!jm{@Cxi`pV>)C~!>^b6=~(+@!tR2J@B zpyO|FBMZ$-OpL}~Kv?h#>du7=Sh^vex$jj$iHYXrz1%x*&fGI+X71Lrww)JkZ+AMi zC@oTv>U4wB_@>EAQMyHCShIAM{QR*q>hn?@mO3moN?|pFSN3|#%4P46;pj^B6(ca| z3arC9i&caQ2&+>byX#n0B`m^JsR4^02ma|%qXZB!5YuT{MM>eih9iGs*%xxL?tWyE z(?Q!zBu)2e1>Q+TxI#5f1U;;Wy7|C8*dg>QykB=3{hnU?Kp3DUnnQjG&?o~a2L#xs zjf}O9OeuXNr0Ly2Vs$EEuUmvBXp*Kls)hKR);p9$lJYkUznj43A;7Fk90-2**u`Jh zPx5oE!0)y5?Gtp5zi7_0BFIBa-6D9b0Gq})2WB~ihk)?h=um70qlri>KqZw>d91Tm z77Z}a`L@?NDdjjUWCT$g;N7Zd9J>-E%UXqr(-?($-n-A;!;VBt)L-3Us+7c;86dKF zbW0bdoGPgKuVpvYRciA1vc{EwogKs7Q?tMy?zLhDnoW z+$cBK-2Alj0tcU5MxqX(8aX~kB?vN<`IlQEgE>Dc*?H$3goNP0RdI&@k4&+kXK0K^x)# diff --git a/PROMS/Formats/fmtall/TPBCK_00all.xml b/PROMS/Formats/fmtall/TPBCK_00all.xml index 588632e6bde8a07cdc5a1877d60d60fb4543b316..0de66c2e9489ec5c46030560bf046a3ec04aae31 100644 GIT binary patch delta 53 zcmV-50LuTUuK}*C0kHZ3lPm%dldcpBlh7FivwQ*=6SLM8ASaVzJsOh?JqnYKJd z1H}S>Vnsl)yvg=KqMHpw71UXsfhOfljwAh(1e zm7$m+1jup&Vh}$MCOY}AyzFKS)G9<(yF!`{J zrXs=$9BL;&w7KpKaw*6vh^Zhp$b@8uN}v<+fGh!iMgYZc|#c2QPA>ZT#CyvQoTlpr-X>v^FGUu5r zARn;#g8Vkd$%_sJ`Oc{K_(dadJbP#pWQh z3}zsYgKx8%#}dZLuR?q#&nlAH9OtFQxOt0r4&!7W-$_8MHQB_kX7dxjWgr2q$qxc1 z0hJa^<_o$3qy;t~NakRitQ9h4^Q#ahHn_-UgP0D+%`akKu}nT7$1}OW5s1S*HWwss zVFWYwrE)QCR>)ui5k8EYk7dtcp1i_SW%955Gm|-Vl{V`YUUJ#|ZNCcRX1ncOED#pQ Q-b+kC)-UGGVn=jX0l|B8!vFvP delta 1584 zcmb7EOH5Ny5WSD`6Or%{Nx_y@LJ%Wbke^0SC^QgDi?&dsqJ7YYeFP0b~5n%`<+E?CA`kc~1g{yFf9?@+`_3uY64oz|Icw6i{@ z!qE$`hmEsgJSq#bDVkZzDYCF=f1~txKs3dMfUjeFSQTZNZk)BSQ}|XP!VRt=_`P^X zU~9#<9ce>|YJ;3!8RbQWad`JIO=^fWBeowHm32#QktGO*Q7SJlperqD^yNhcoi9#J zvB;7}NS)51ccwEJI=~v#Y@3<-kx%fq;T^@J%K93>*$hwMFAYBEQIXAq-(kcwAVyb2 z$IPX?-h5BVYe3)t3U#4KQPPm4vC)UZ(t}jB_tNse7> zkOxKe$O2G;-V!0Oh8;j7#OZ7Ph)-*Y-b`9sHStf@uNm~vmY*BZA;K&1RD+_DuT^y^ zRC~IXpRedM2waMec#&tIZB22KB=+5o4gWrv)_K zay1&H+wy6D>*Z)he!CSZqLgd`Cr`}902SxSty+wH(VeQ$fa_K?5+bK~$UT>|#c1T2 z9kU71x%f@rkHj+3Rc(4)a-zF&Ey8jMgjwWbIbpkmcL=MXn5Ije{L8r|g-+M)GKp;= z?wodn;=ky54+a`HjW+xT$5%O zem$KspYJ4pdLp&gneFk#>t)NkD)wIwMlH56K8&f@T-av(ZQu8%TsOo8NJkt?yd?ZLr1*FK0H4My*&etXd-15rz>% diff --git a/PROMS/Formats/fmtall/TP_00all.xml b/PROMS/Formats/fmtall/TP_00all.xml index ab0037b1d2ceaaec942ad3eb84e49087ad47f7eb..292c679abbd3e250e7c2c3580a971c0c08ed540c 100644 GIT binary patch delta 45 zcmV+|0Mh@?xB=9)0k8}LlRg3vlaL4svx)*r2(uOoCOVUZMI@8dMbNYAM%odx-dJ!0 Dgai@O delta 319 zcmcbzmGRsT#tl47lCBIX44Dii3@!|bKr)d*fx(r*mm!}aW%7Lu@yT3FLWT+qen5T+ zLn=ctLkN)N2E-tK9$eIxK?x|D$dCh6k;QaCJTCrZZ6^uY4S0CfyqAn zRhu~kxEMF@5Ok57oMy~7IU&(%bArJ&_RR$rXP71zSZGZCP|P!VpRds54GwafZ&{yE znar0cHQ6BX*5nQ&rOic22Us?Hq+2m=o{{k@ck;G}N}JDJ>tfry?V$=#=pG9*kktcp n0Z_c|xg8sbvH09I#?376U05NCdcLYKFTVDJ1;Uf~=f?y9L0wd> delta 1192 zcma)5T}YE*6h8ZLiA}R?`G-19kb#qJPMd*+e<5OOZZt1+_O;EQ(y4Q1-h>z7MK`JE zrmOJ6EAhg3yX!`~Ge|@svI2>Ipy;AVh_32+zi+cv3u5qb-gBPwoag*(<(uLCta0s? zuB3%RG)ysSCIw%GtkgmmX$;;l)l(U7>h>$F)I>vwMQ9LSFK{z70_y^BQQ&XDj?xTo ze9h_i!J5Lm3``w}$6!yA50*sBcjV9ues~pdO~x~t5Ss!brlLonLcU|v1(d8k$@Psz z;-UUYnk`w<6piAiNEyEglm*PA%B{Q9MZ=NnC8;8=5Urj^>M4UH;v71O_tIEvTeiKJ} zH2;;eK3;!r5|67)M>ycgDvDPn*}iOk7Vh4eTApB`E$A+QdQV z*{G!x_Y+e87aho*RWvZ&$_a{)!7oDWdHkn5>Vse$} zyvZhF5t9?dpKU%QQ6MHaZ*zj{Cl)y8fL8`T zj5GOyw%BBYAd$_7qRd#pX7R;yO`Z^cU~-tc(&ilr8(1c@Wk_wFk*dH5X1qw_05NJd zzsL~D*erHYh80MtFm5ioeufFcYP)?8!kQd1S7`Eq$MZG^J&=IPt$X|e%DVFW8zTTa CAaKtB delta 1413 zcmb7ET}V@582&crqGGN&k8A!gw+N9H%wgt4%{dgKbju&qyqIS{_|u%WHnf|dh`P=f zy78hS>RS6E=tc~@2on-22okZbf^MPxav6}9H+Qp)Zo5e~A&4Izv2 z?PwOf`F7H(#~#x34k8wpDxd@EgdZ_$pPaUqE5tQVLr}P=@zbNv3i(VXzOQ6#_AW`I zvMZ9H2j)^dT5mV$B`8||gqNLKvQXKYnQjM;Sqlb4@kZvS<$#wS2C5DfCjT;Um-f7s zC$yzYV(mn`#R7^Gv#2&HS_xq)z4E$vXY0C=ZUicA#l(JgMu*zjp8Fqa>TG>VFFI;? zq@&F!4%X^xisLG%7%tS%cBF}~ckY-3+^G-8CXhNR`$@hFZG5|X!1~YZy?kc4*#y5; zv^HiIzAeSReY8B*aIl?YZ$kPy^0MXpyI>%WfgWu32zD2j5$*Qyo0mVBtiAZFt+ZS_ z9*zbLe+DTW_0sc+pE_|jZK*Lud`HCQXGGJmmGUOw!rLt|+!--!@s&wZFs2+H1~LI$ zmZDyT`(ou&N*I8I{IK*x&4S#DM&7>ZE_LXonpqQ)4F-N|d&}t3L-^TQY)cCspN7o5 j-!)vZun diff --git a/PROMS/Formats/fmtall/TUECDEVall.xml b/PROMS/Formats/fmtall/TUECDEVall.xml index 4d8517dbc0bc85ccc5b425981338c9828b39ba74..33427987f3bb933fcb8d53c08a379863138217a3 100644 GIT binary patch delta 117 zcmex!iRs2^rVV#kC-bpQ*?fg9k9qQ*Ag;+NTy2xM=S|+l9WgnCCuZ_3o`TIkc(>SX z{^z5{Ie9{u)MTqLuE~4C4op5Js~XC!(ia>I!F4_U=2gbZL!@UjCz>cRaf)2*(?J=><{pv z0}`YJ`RGe=`vZFKC47*m9(vLjUwY^*$nV_WCTJtZ-M#nwzVn^$-1GbTS^KlEz5n6o zm;K!xla!<Rq;5JFX|7&N;^wsXzH{`SvV{q zP8{u~fGz;L4{RBj!-af+OZtOgPQrkfSo1Ukog*Xg^}NBK^r~J*zATU;)p?`eSXW)M zz>1y|ywE{XN&Ya6$^|r<0h=Q40~=7+?$>w6yv>Zoqrl_ zuG#f5#>d9hYx13CBxNPfVo;!>_>XoI01i+A@_3brhj}6 z>yb6Dc!Y((mIJQYe#)X2lKXrzZkw6qdZhm;$Lz*tlDJ_1o9ilAd*zZ^5#HmX)%huMkuOO^KTEemKjXNS9ce+6BxU>UH||9 diff --git a/PROMS/Formats/fmtall/TUECSAMG1all.xml b/PROMS/Formats/fmtall/TUECSAMG1all.xml index 4bf3cc1f7a15c06c5c1c62b6b544510d5fa0744a..6a97976e497195545c932f4d102d77c075e3e611 100644 GIT binary patch delta 289 zcmbO;m*rg#%LW;y$!$y*Hg_;@YNv#<*GGD;Joz=`~O)?*|)L9Z+flD^Rx*Caq6f4H z%7v$0Sw_1MGcFW}D;E{Dh$09gf*y+qDTRU}kiP%kxjNMixr_h)=Y0P;-}%n@|1X!V z*GH@q1!lgmdu?ScHBge`B-2jXh|f)XDFsUp^->?z;V(ti6s3Oby0A-7GY!Hgv!||* zCG!i9o5Ha7Awn9yq3moEp`jetzVw@r<<^_-^6jm{eBM zPi?3;N*$n)z^Yf-0!wFxSb)4#N#%S=sw~qYw*Vc7w-bd#p_L56X{v`+oD%U;uqF8X zjEf&j6+A7KTKsf~PX_HpqRhdJQeCPb^}u&iI~ccXT=-VRG3+Ymhtf974(%9+Kjh>! zA*IklZ^5ss4W4Y(4uFIVN`IqVHeF}YTv2Erdt7I22Z2rjElv!Ag3NQ@k~~_Nvt1Q+ zkq~fh$R|1{I^|V+v>+sT*%Y($8`lNfKj(NZZdXQKYfN0_%oP*IN1Q8yO=!MQ2pT~- z(VNAvnoqZDdN%_(z^?cPWxOD~sZh(@NT*;4r_aenY0bLS)7I|82TyPA-5JhLiMcjqI z7@hb_k`_$4xVE^gJW{e*nTn2E^XjqHE`WNU`C3PbGSr@LGH|?#i8n_8uKToH(Kg{~za-WT&s+(TGmQaWIJ|LC(ytPl^8AYEq`( zPFmL)`O7JwyqhmJDWe}>o1I1oANi?5!`%4v+3YgLc!A198k>1*j6%;TpvM}Y&9N9V l_N%#gZ04mh_I=VA6F^lLmn}hMmDMo5SB?K*jn#C_{2Q{6cI^NF diff --git a/PROMS/Formats/fmtall/TUECSAMGall.xml b/PROMS/Formats/fmtall/TUECSAMGall.xml index 88ff5e7ed4982e3b70941dcce65a500b00571c44..aae4b55d2c163773e64c87fc5270aa9682a2bcba 100644 GIT binary patch delta 249 zcmbR9llj&Q<^@cXvzRVy&SB;dWQ>@ss3f}io=6J&v>3R?(oQC-mKyi!#G(eTVwMD z-xATudC3-&pM_{lPVnTLJRyo@vVn=(W|tH%7N8!L$!eJgCU+SrZT8Dr2Q)6<0;n%v zWpYcwn$6P+Ez&1{`=Yd&>*g-j&ELMLFisAu6PldxV&3KpPYf6*FPP#nS?AFvu*_zK mC$E?wEWa1`psa#7Cm^iJelMJIie1&eyIV%)dZA;gLBDSFk;ufjdjnaO(&2$@cqS8g?Z3)@w zMu-x+?WVqq{)Nb((jW;j7hPBogk1%ZJ@5BzGHnpw#rwVIJm;L}ea?B`kDI!OzjTXQ zw!4m;>!2RWP>kYqf$aEfbeVFnj8T^I)QP_w1t?4t*rl*bQy)!JmJ8kW{719gV51uVer0LWomJ!b^e01g zFKP>cl&(;mxBd0J*?myz2a7m3?e&@ul|&bPPH~}AVvjX#yb5#P0t(FS>r!Z^1QWCb080@#qM*1%M?&s&L# zz}NAkh(W~d2(FxnZ$_HSi10#WDNvb56nzMTg}4xY{6*=;9;O4BFmZiwY28 zUv=;lWn@S4qGqp=9my8HmwMVJZnc=3oKmGUDT3tgs~Eu~34O#15a-Z{w7(y5F+}C@ z3Yg^cBi@7*0wAW0a1b0O6(L=6=3Qamu}UrvwaRaPG;8Gi>PKyDC4`II7KLTq8A^uf$?Q=Y?8Z+Y^ z*6Bb}Y5NCG#yiY#CKKa!K7PhmOvnN@!i@J&1meUQPoM~-NHYeofDBb)-2OpH!RW}JReVP>*ngnqEea^o|b8Es=QfBuxt4C9D13@Wy0 z)grmYK%0u9Hc`o2ST0<(5RwQY0xO9&K})wm^xgO7Mao;mTfBSE`OZ1t`OdjdHY|5G zEiWw+zY*Hk-AnzHr4*&&?b~@G8<})E>~-2l(sOM@W&PYgKC)_(|d8F}bsSh7#y5 zPGjgKgTK+yFf8M^2?e^yN8J?UWx2ak&pZrt3f^&$jYF3-^`Of>SVfe`mxnD=S*~L) zzAA?*&%Mls!;zW*UEzZzhc^mDsjAC_)_NbJCTSGBM|DPgpycG+a*)50kJX&e<0|tt z%vK*kX`zE5dt8w{BH;|IVq7thNrT#Ml&c<^f@DD(C>rLAl0!Y@e$4h1kgh5`Uko|I zx=In)l3Fk520aQDg(5z!jP5h+x-wA|E~0?Ycj>N^-!9tJb zkUGeZIfk@aqay#$j3(%FYF_VY%t|NX5WU*c_lH${i_V>N{Kn34LT_`y=&hoinRnqF#o?kwAFx diff --git a/PROMS/Formats/fmtall/TVASAMGBCKall.xml b/PROMS/Formats/fmtall/TVASAMGBCKall.xml index 9ddb061d33df8912add43c24ee355db9fea7ab13..f9bb54955ebf41a7e452a49c3f7e263c569ee966 100644 GIT binary patch delta 243 zcmccglIhoVrVaDhCtqMUnry<+GkKZ5z+@%Ps>y6zNt55ma!u~y3fSz$y^V3Q46n-M z5?+(ZuXt@H|KhXQoWyU#xLHo{8UN-Ps*4ym-%{#h0`wn(Sj;0;D%>K4r6p5lEOZZoXl^iV4Dc;@rWwd5-HF zmd(e!<}povBPO)@gs&6R<~>0^jFZ;|ZUZvzuuOhtt}@vm;>>2J$P~BD(^jf5Zho?$ cg$2S|vFrj9koAUn^Rl(im?2^pHZd^)0Pq%RdH?_b delta 1512 zcmbVMOH5Ni6rDaH1&R{dB7s_3||#=;)vXXjX$P11R18Qs-8Z8fYPmL!{Gvn+^zUM#+kWvtX(Y^8Vlg`sXX z#bnqczy{bHo53fu1iOS?62DQ{yI3u2#;Rf2Xpg{YQ7%?XCkt+l4kJp2q5&{R!4kxZ z!`6p=H#Ee+?T5CA;0_|+9K1XO*BxU$h@A#TX5&Hu&oas4v=K7Vr-Jc(UQ?WGOD5_q zJaIY%rb$s}e2aY=ES%GiHH%Lc6}rLG15fy$yra+{Lt_BHGl+2`MyOD36|U*Z-3U3u zh9Pf2q=*UvI|U5&O+mmff;cE7^MGLz31Fetr7T=!&62F&F!Ebfl=5-!nQ@RL~h<6G9YZrOV`nwXsGN$Inmo zXMAdz=?2luJ62_E=jRgo*;HAU$<4!^_*y~XRNPiq9(U{0ZY5%Swkz8}CHD84{f2!_ zv%lB8q1kWP>nY_}-ewEY<(8}TqiN4pqK_?4bsEr;OG~`u3ekhsscej*Ytsh7;MOT$ zJ045hV6eXGx}iy+96S6cuOV|>{bKgUaohU`6TvkV)|zO-b~@yxYo0 zn%@pSPEqlncX9%QhC4yF&hq7|O69xPBhYoZ(R|eT;Pd+_t1;~~W*Vo3ssqYqpI65- z{YNZq_AM&ceTzHtg*tj;x74XR2Sh0eao_M@Z4EltZl`O__1S%+hQamj+{)8+iYvz- zq6tiawiBb6ApV5lS)p&{eahY;kGE_9tqO~mq92ZVF_dkJeEUg$c`jEAbHG`zQyi(+ sQbjIA2kxz1#q3{sAywzXxR@RHyB#ZyG(LPTS#lvADpKY9^+=Nb0ya8qh5!Hn diff --git a/PROMS/Formats/fmtall/TVASAMGall.xml b/PROMS/Formats/fmtall/TVASAMGall.xml index aef76cac69da3582929d57e4b7d6543064534aae..73f219810c25a1bc7b13d67b5cd837d303276592 100644 GIT binary patch delta 303 zcmaDhmE}nX%Z5qJlaDa(+Pr~9g=sPqd(Y+_?2nixi^+*i&f@l){DGHcatzP3$uWLh zn?-ne7#An-F->+66q>w6AZ~JqV9@4!f_;peUkD$No_xUFYH|Xfz~l?Zv?l8r@=O+p zk=tBjP{1_VAxB`cLT=FJ2IB_C$=3=6CV%h>3Z*976mm`8S9odi1_PzdKZ*ocH_KH_VVo>ip|bf+Wl;QPwKpn^ zn`>^hu|il54{MkpET*Rqpe&7-Pe80Bmd$Bj!x%UJ_!zLesZpS2{!mm-Gc3}H8yFGBoNF$R$FU-7~dsKSHk=%^0q{IawHDMj35cOm2#?D;-9n%F!!ZK{cwBajU{rHBkY5~|@uoi9! z*dtu6J3XD)2VwWYs{wWZZw$8c*h_UCnQe%V@RPhketocr*R$JQqLRKrAxJ&Q6&a*= zj1m%CAbmxU5KtNPd9Zj7&*bcOxl@<|23pBXcZ#Cwkl^B`oQIh*ff#?fSE%0S6xq0O z#NkXJxD8rqXceW4cy$W%v+R95b|jA{>hqO7cg=Rv3r5$e6VvpibQBG%3|+S9fRY{P zlrVIz;nkhPC4L|ufZYpgE1E>Wp~GMkCY`;*PVUU>arwbjGdQG~i)tO`XY<#cb% zf$w;nA{wupIRR;kxiQ1dZ$r5}-c_pRj>hZ<+{Ve1F(nPEGO`^GvF;6^~7=FN|ec`j4Cb*~Jli ziB*0b)#9n4Iy3I{$0h5y8ahVxR7VYFT+`=eyJf#B_#+N$7niLps_xZ=jP2dry?R%T euf?rHYRu-P-ws=oty10})7H&XslR?-bNm4j0cdal diff --git a/PROMS/Formats/fmtall/VCSDEVall.xml b/PROMS/Formats/fmtall/VCSDEVall.xml index a52a17c7a8d8847f9bb4037305ec29d077a23d77..99edf9c6f848f96f5f77ab97d1162f7edae8b8d3 100644 GIT binary patch delta 122 zcmcb1iLv1<aEV<-+OhA?yGXQTTEgJv; delta 608 zcmaJ;K}!Nr82om%B0NZj35BGBgoPlhXh9MtMi(_w5`w_cr8HZ^mb9DEwL|tnhw9cJ z2=?Hw=+dEM*Zx9>gy!ukL`W=ec{?*ZGv9mNSLyvtdU=xg&gq)YP?nlhC6)bQH$O=C zejnw4=%ms)6|vjG65rYg<#xzxtjlr9E$B1a#k);O3Q&wzDZot|&t&P4I$&~?HyMQo zwr5WYLG>Y;#$OGSi}0iUAZ%$%RD(vRV=BPm6eUuqu?_SH*bcB3FpX1XH-Fi09Xj$0 zKq{nj&pEqcxfXy`OeM5%5UHYH1j{$%M!1z*ghvM+1KDGAC-#E8?3nY4$wi!HD)z#p zLYJta@l~vEXe-~7X^YO&1*9!JVgmJ7-grI(RSlDxy;xO3Tvz6&hA3YvpXq<&%}F*< zq(Ucu3YKtE!db;#BppHHCK_3C=W*Co^FDJRtm{e`{r#SOVJt;aS|bI5kYqHHOxk@C7%?7Y^^A6vCK+%7UO|oUXpxM*dQ% QP+1j56cI~#R(9Eb0F$SGZ~y=R diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index 31e5e27468a5c91a10f0d2a2edb91541c3a42b14..29750164de5b19d3a76e3d143e64bde616ce349b 100644 GIT binary patch delta 542 zcmY+BF=$h95XSi~uThd19ui6j86H6egA@&|h8SaAM5L5V4&o4sgM&k+5YV9@bP`Pa zFYh3R`U=4mG!lH!OS%}V6s)xt3>l@M)QUmGsRSwhQxNHLeBa02k2|hg_jk+w#vHj- zvZ3x833uCwS}J~WUfCn28$0FmyHn?8JbbGKpYn~F>gw22_ssd*P|q(cyVYb0YA$tF zB`+?pHH#o;7hx#pilL(Eo@!hQa=P^|-M>8iz{-e~K|jm34bxsin1gNH;Ppr7@y!nT zQ-eTGzk z+g}ioNE7KJ1Dvu(qw?|2<#6TG&e*K7z( zcKRsr_+tckdKO8U_=tIff7RgSd>3)f)iJD`(*|e1BE*vpLXz*G=s%3{%EC78czNl& zW{-cv{(+L>E+P;ejz9uGu-mQ`RtU9VorXlK5G3Q$9{txp!R0AR^1~Kw4$_1%s4K8v zP=(w24P4rw5{K_mj61KXCp)VY^A36f;M5y^M6ON_SKd-Zrr%SUc;*w?(%qzzAzEfV Fe*p&B*P;Lb delta 2139 zcmbtVZA_b06u#%SKph`rU}2>ax(*D34cfw5y0`^~xT$=MuizgOJKDfzVWjKW__2hj z|ArBEH;!`=S)H;UiknS*H$@~e-JFK87#9)~1tbQOxuEfvaf|1^Z|i_G8;NP&@^bET zpXWK}+I{W<57V( zL)<93b5B)P5Rac&juNYnwGwj`Sv)|0rO74&AECIFS=e%japX6 zDoM$&rezb~Z2zoSi?+}{FEO;QP}@t*XWnpln6>HRlcxe>w|vCF}(m$ZI5< zegX$+yH=HF3A~RIpe@muM4BT8DVhCbM0Tv1F!DGA)V_%^mqRQ$Q_U5$F{&>QMo@Lp zCi4^bT;{@RwPLd2lCnb;f119#={Zbm0X0VlD`F1uo9o@jER=gEnd}jDPLsHhn}RR( zL5e8fX%L~ZI~X_#X@|7hG?L*~+V7)JCmEHslbx}t2S8hk#waRrg_(iJ;AvtFyU|r3}jXR>Zn^8 zbwg@B?my1c%uUoASsNd9RbC7&=X|z>72>S{Fk=5Cl%ZdNA)Gw}yYbf(^!2En%H}?B zCxZn&$9eigB{nJWJpMEZ)ymQtxDfY9W;{0x#mblOz;k?!SZ4@kb=lhemPyK^8*Qy@ zke6Apeh|z`(fhC?DJM3tmBxe|8djWp8?u#GK8B|f){vgK<=CbyUIBwHA#wxJ{y9nA z9fRw7oalp$&9U|5bddu}9(@nO5Y*x9N6;W!kcz#7pvR)C@Cous82n!}3eik(F>TYM z|1@M^{|v-q?EqvXFCShu?3jTq7?^>qgh(7u$cXJ4geqfa@L$Df;O(YtTG`91ir+%# zO=PR&rlyS^uD6FMjD}R3n#}cvqG-R#a zuR?wY;@9sbHEkXR5vM=kQ)}F}$YTPXtW-L2>CLg^9W<8cr$r*Z0DSXneo9#O7;tHX zcVT~k$K&`oci`PVdYcY#11?Otj7t) zd*bR+za#w)N(cGZC~c5|EYje_d9vi^7$%xoduWsASCQ6ryl)UPavcuw)^Wsnbqc$= z`x^Gh@tdecdFVD$;^$yf19#>zt$A(=aZz`1xs{hzkdTFkSZ)dhHrI|QN7{?{+Qi;G zF0#>V;@S)rx%2|wf0@`N3=w}RBf&Syu(xJQB{5q(uZi+SO>9=k*eQv^6CV= o)1i7WDzj(kj*`l0dWMj*|AbbC7U-|sa21ljKpyIHF>;6g0HvSD-T(jq delta 2277 zcmbVNZ%k8H6u;-)XKR>L{sd$Y1VQF11=~^($VNcGpaP<>p=McDY3ER=SP^GJjG2>V zCR?Hpxii~TvbiNLF(i$-AJ_~KKB&tGx`ZV<%sv{v4EM=w*`MEiuVm;tN=(!CzI%S> zch33Ud(NBwEpgt1~r8R-17xq^CcVJbIZ~<||!&8lw+#&v|;g5Zmj zr~y#}LL9(psWa^beH3BXi?Sn6Tp5~iYvU^8JuT(1RZlCj=|B!ad_st*>NU>_Wn5?3)K3>y#)XO1XDIFK z(1%2#*vD<+{tWqqW0ZQt$#1Aw-Wi}lZFwXTBwn3z#oc}_b;+{)(^RTrtd;X0k;@jJ z{>TuO%Em#;#a_$<< z*q2k+u60_wamSvaj=54aj8K_)Yk(5O*>jXB$0GEKT~wc?^!(U)so9{$i|PiyQB#52 zGD79jHA++Te12|{`)<nPO_3Y-*LBxOgPE#ovPREu;PkW!j@gaeJH|)W*&< zs*ZW{w;<~dcIX+6+i{gurw5_)@C5y#C+4zUm8fG3}F%Th#Ny`ImGt ziOilON2eV7k+$1bHz1bP_-1E{!Ut3+i|><8&zdAm_5azm90q@;1oAW@&*R_=qbfhf zh&A#TCYBna>Q$ibQgonxaB-I8#aZn}OWID{w1D|CX@*~PK+EB`dABAmZRT6#6F0Z% zF=1Z$_zixD3%8eVmDkF7pSC6zTM6?jzS|_{t9ccP`ENB{WLENA@u*tM5N}rTsrY_% zvAN5bPjP=w^7lGEpk>91@5Ri+D<_&m-8SB$t&4^8SU6V7HnTE;(l&^-eSA({Y2*)A z;ZE!E5Rh`Ni%;<7;pRx3D!~-q-pNC9x|h3_%)k^?LR2sR2V8w2vH$=8 diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 70bcb9e4f74b4ef0c330f5f29e8874d6c1f146aa..fa17a95ceec7f600c21481742eacdfd60a74e2f9 100644 GIT binary patch delta 542 zcmYjNJ!n%=80Eb0`Ap;EHH0Wh&_`?op~XQkh=`Ooil7vS3?dF9BBg{54u!f%3oWG- zNt9DT1O@Bj5E9|*Ad;a&2Pw5Y#6fMOwm2vh7on(l->cXxm+zi)&(C)kzPodqZeu;s zO7w(iT|P9N<;$d`TJQUZg;yUUS-(*7T2rN>RbL+HOooFR4kCMz&I&y4yv22n&6+8A z28Uzoa2eb|lEDKEX=fbO97kUvuQN52d%3fSEd5P5y88q-Q}JCFnpio`HzD$D5H^2= zSdJK*S0>=A{|Xq2F-=3y*FPNe*#3wkQP{{H zKC)$M6}B+P)CP|7_7~jRC!QMu)0J&#W!rk)%hRs(@zOC_Vk0BAdOt1az<+Q`=W~*V ze*J9?S^FprT4kdo4I1V?+hs8yRFHEF2ILG2HOpZqDZU0G=Mn34)t22Zi^wM2aKRY4u>g;wyv3UCKMy3-=BEd7{Q32o2r&M|`7yI?oM_0$t8M%?NabD{0aBCPiKqHfyGxFKpEHJBvTlhr-pL=+a)zHBswZcy544%pNL{8^h zwe-~-*u|jr;Dt(tZr34-g6EdJTj=Eh+nG@VKT!-7Goz*p_KG;trz6ncUwMq*zt*3-&CG|T?|sAXgt zx=nXc8Y-dz?%PTy1~5-f^kBj4g$c^QO@-GnlZK8l=<*P5w23P>){FHizM06yI9y%Gt`7@^CbUBJoD`OA0jdfIeq6|~UZiC%ZT28ZU z;!R>}xQ$!34B%Qz>N>vfWZm01s&pu#mm}zreS^3F<0Y+c&=D_5{PH~Yb)kh`58=^x z5QpE!#eYaW*Vw>jk4T~|BY5af2+1RsVsWj$rE2*rnQR9WQ9p-|x3PvrXw)~;uai>u zF7TcCF^clXsP=evx|bKNRsT=w`Gv9T#ZW<4zi78;V}>ZButOxt&?n7oidkF=C6bH3 ziA329l;Q7MiO7!Ct^$@qIaEL?l&iKkX;ro`%d;o~T1?DxC{rCDpuB4mhqTOCm?co8 zep!XLn40b4J@q)nZE_Wg3-n^HI6%W~nwgGHYFTpLOfeS|fv9FClm#|n7m4chW|EsN zO8RS=K9l5`=Ev4;+5*WI)SCWDHp#MG`VTeC#Fm69t58(S;ap+Wa$*TtYzWB~RT%dC alG6Z?cNU8~rbL7d{fPCOBmD&;OZ)`cX?qR; diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index 8f3214a01b8ef79f5f7b28963beab76c09b075a6..68630929027e3657b7d951baf46cd3b2841a2ede 100644 GIT binary patch delta 356 zcmZvWF-QUd7=^LB)Rd$Sy3E8RB!WsLO6m}ikg&KMA{;8p!9YbMLL!Kqq$0||2cl)0 zL`0DEM@WQ7gG5t-98J;G5FrxI(KQAwkN3UzhF7~}9!{7-T#bVIiwv4Y74q#xN^v>{ zk!cO?J0?-)Sd8&=_~vaC?UWeucl#8m8wDs$J}j;4VD4gx>v?NMdfZCMp%*PG&NPLE zL6$1cS_>{l^|-V0$VEkz1T)TO%#@$v896XeLwr>I?hzIoaBZ#OXu*cCo2Of!@PF~S z%(5^B&ZrS!8QG{&K2*ZxF+dEa|FAu@OCKS36U|4GN?EQHREh01r)Jymw9^NF+>1y; zN9IjQ1?!4EWi`qFT&NFBU^To!k%Uu)QqY2!*pKqI7sY)KUWa=rc))4#p0&_*#;Bn8 btV1Ew4Qj_R%H+fmNYzuyKXVL8RXy_qA{LiE delta 1791 zcmbVNU2KzO6h2J{>oOSq**EN07V1b5mJEk<$%Y}>*V-|c(&9FLL>>89%NYGle}shu z(JV&2;Kwt$QqU_emI(NUD}SPi2_qx~ZoKBgYhjUaVPfDp-`8n3I}=RPe((35_dMr0 z&wI}4!WYipuQ{)ub@8_!d)LQk9~CG?Y1%_wD&tz?2u0}xnUtp~Y>rWdW+;o*5RR27 zM(<)>q8WbwmX8nWZJi11SFl&6ajfK&yyxv*Ui53K*z$Js_T`{e%Hd-QP+bTxpkBV^ z{$a~L09Ifh!*dd=7ywgXDq+gl2Q_{}_o-P=n^TjxMHp>OP3+d%`Oo%2{s2-K$TMpNL1>=QJ3|p*W^q1=@L7whO=lYW zc{&2b5*2v6W^6nF~)MtT9W!dFE*?`ax=oCOqQia_7bWY=u!`(d6v!L3#-K_%LTm$C& z1ABU&5AJI6rh3%($XO4g?hpLc(i)_Q71E>(8`D0H?{)E9+|8+-FYvh?9sJYLIDh$4 zkn_Vq_0ek`&Vb#X=~`V$8AzVOI>irXL+Z!9zcfo2tzHJ{lwR6F{cIfG^?cmb)#TSM z0rb=Zz5=-3{{@zFsC#cVHPtJ@Uv>NV!9?4qgD(Dj+{;Z9r}=Ss(~{n*FyUFI9M1ds zym@^EhU{(P6UROjXUsdaKT5~yJlbee9zqFcsmz5QjR#{}xtL9;bLHQfLya#|hNaBoJgA!()aIEBF5Z7y=ezH$IgiPo2aFU=OgYLYT5>gW)9L{!7zVDn5!J)ZTpdWP|8&!U=~ z%5gE~Xs~TuG8$~Nap^nm=SnD!7CQy35`vn`X42~*CG!L1_{H5m^$m}NwIp;)S${SO dIN2k=kLT~qt1Am$XP}W;$`ZA%=I?Ymp8-%svFHE* diff --git a/PROMS/Formats/fmtall/VEGPBckall.xml b/PROMS/Formats/fmtall/VEGPBckall.xml index 0e560e487963d8d11e221fcee69ff73ba347eb28..052c871932316c2f44f06af6cec7b48f9e2b6705 100644 GIT binary patch delta 394 zcmX|*OG^TA6vgMx{GDR7urLx45$Q!lm{8fv9=IroGAeq3i6Phn6bzvVvRoN0%v(;l z5DI%NT1YpXXc?^{2>JxJi&jF=x)GtxxxaJn<#IlLG|!)!{4GyUd>ZhOIp~*}tvJ$r ziiK7^Ia?&HW}b_10UVxaq|>er0nJO2c8nY1Y}|XZm9t`~uK_!|)5Lo20Y7>R^y=&f zeC)TQcOZ+Nhz?^>5nY2N43C=8H_piJI;@kIBcP+wv=`*e21s-?(_Vw(o<0@b#(YAL z#eE0et)6Re_oNo>aT8?≪GN2PKAgD@L4}73p}(qr>EyiHtiVRqBrpD#S#Ait%5T zI6ciPCLCFR|f-+aLvKm14Mc`Vw48aj! R2^2Np1zBC%lw1@#g+D_)lg0o5 delta 1949 zcmbVNUu;u#6h3#i>$Fn$r`ZZCO>1RwlZ|yF_F+Lb#{5{l!Ck$^YDo?%`f)76Ug2X-f0DkA*b{k7WoVmHTx99hr zbH4NUes{n2?%%ave_3N6p*c!Wl3pbr`PB8A%bI5tq5?#Dn#9{{xaEJQBIQQi!MiMh zwgEa$G00QEP5^O+(s&bmjt1!@-g9(@?_Kk#oTb&<@g#hKW^u&?vPM~0`1!+am$pP; zEDckqaGInz%nyR+J5=D=u&Z9&B`Lcin-4m8bLaEQ-)4L6g%KPTV0u+C167gcam6Ub z^?LKt)hW%&O@l4!kiS!JmPoTSZa5SYK?;+P7kk~V!=M<$*#w@mun~cc3YGa_Gf#y! z@mIYUod+RL!pj0^7eI6vcZQPu*5@5+Pw*Sf83BnIxEQ4aGyq3wBjzTOLAuI( zz<(Ofr8)DGYqt7n$#!ZWdZ+u{UcX*M64D3kpB~K|z^ZYgkA3ML5Z-@WlPqIymW|Ag= zh(kY#D+BhDM59d%zvfv*ZYFmU$kX60sDAPrIMden6Shn%ozz7=6rj#BvYU31oow_h z-z(brPSEC-Y!+xQN+Dh4g^esc#KAj8>81M-%~4mLBK~p4qkiuHps{Nuw?=i)2biVf zcuJ3$gJ5Q)ojPc{iteA&HmGuQxZmFGU9I7N^7HUW%(^i@d~3Q}y?6BWnvJQcThk$n z+gt?_uylK+38a(>4A)QNF4d4aw8>K)7DsQ$cJcA$x83S&es|qQ!{vwjy40WVKBG5Q zMr);iIjT3S<@c8@JeF^Hu{r_SPO{o$kYfBx(ZiYje)Z3}tr`cgE_gFft!&H<|1h=>nP6^1e~OefHqn<^$-cgz)cVKOE7*y0aRhmkdm!cIf{CajL#R diff --git a/PROMS/Formats/fmtall/VLNCASall.xml b/PROMS/Formats/fmtall/VLNCASall.xml index 468e96afc68585fc59f19f39f9d64213b7a19547..c812d0fe1310e71f888b834b67b041b49ae19c8f 100644 GIT binary patch delta 48 zcmV-00MGx7c${>w-~p4a0vfYk0#*UD_5;KNlR66&vpNU{9h0mj8k5c?=Ck@Hwh^<` GI5-2~fD>W> delta 446 zcmZWm%Syvg5IrH-g5pB36a}%A2o0iCZR@Q7d&%)AWE1pbLPys=gz%PZ?7NTjJY;K^pRp0KL0*SXyXt=gz9Cg=xoD7 z!YcUHcUh;1aDiiHdkm@LAGC=wQ6B>`B9ybS;TtPQaM3}JM};JxqD#U#+bxm~h@KGh zh$X~g^<)<^&wMr~T0A*W<6Lp8MCyp6LpY3>ne?;4+_x4;mUe6s~x`wT>=7P9IJ{_Kv}qQu(8|C}849f)!tm zP(FH{xBLd-cgTzNb_vyE8oq=y40fNGkICE`eBOr5ULST&zHHoD&kx@04R_=0s~)_* zZ{TWBhPL<_rO_-`u8awI-|0baT!Gr@f->z!INgQ%)H#ey+U}vorO_b~;YIbY$laV2 zkiDm}U5dDn_VASB{!lMU2HsdlU=M5e|Ta^ zutrqW(?MRtwi8>)E_|Akk$JX;(j`9|3kin}UXH$~w{U!UkPu%Eu(i_B09Y&Yh4o>Q zP<~TH-YE0ax8Gp~;uIjW7@?|U=Fd}y+%&ZqdBi=ANKNzZGHnP=u3n>4jjz2;-5|GU j=5JBWQLy`D;Y^lXrjn(~e&HXdzJ1Q${kL@Klo56T2qVH~ delta 2361 zcmcIlT}+#06h2?OLdRHF=zx{36v}X7=qwDOb8fK^CNT`^3M?X^%e_~>0jNxKNpYyflXMXO^oA&KF z&-5LN7iz)A5kN?JOSSz4S=czd4}-~1VStYUXGLmVp$}gvfKElbr#iaX)+h> zhAV+!OLS2RrRI7R8*fPF^Q~>g>a)c+3?|7w#&2D;@g94?u@`~*K^es7C>Z>xFOvx9 z!>%q=DDuUTY#3)jNaC4jJYVLlY64>fs1EoekTaV>81^XjXt&4sXZwVwoVvh2h}%gZ z6JTu1u&%t*DMIkyuT`kg(l-nxevpsQ9y~z@UQdFFMqbW!?(?LrdvPHI!r>K#w8DB2 zwt)5qgA`5Gwkk!b>yIfGHSRp1II_|GbO5yS^o#Xs4ZzpRqK#RWHn;^6$z;-m^AN7Z z@$H9bdk{MbqH*MbSK=#WwxV>o(q-~)oe(ERgM8^F7cX3}*hGqd`y2(?P6&WoL{F$y zt}BW(^pSM=L0lWq0;4Dd7kNaIhsaA?s9x*WG$QLw%hZX0lSoFBPeY~oB=se}w6})p z$Okqb)qvHF33!lp^4BG6c(%vP-;{5_C@p!?(R}GuRFAgKknN2zlJK}wh=2|KA6X`=clG(o7A08wHZ0kUu;irsKLwxNZ(1R z=sv#PYv;?88`yiyr+&GA$grlI7OUjjeGYzPB6AReYoSarJs=(khCY zG)4JTpOa?~m8$V%zCp))cH$4Ch=NtSw7$Ij!}NP>ec?WyJ<-k!$3IkupSx(1Dk}9e z7{yb_K1Q!oKYuY6Uv*2a0WUsBv+Lf%95_2rWOlhrDFDuGW~$A`(Sx@Ojy3tDkI>(ZuDt$wFP(J_Zl`*qA5K7EP%-hGo_ zUTfvTGwWA(VJbrikl=!(ZR*U$lr^H{n6$qkE;v(^y9?pRXjI#Msoq{CkAJb`^R@Hq z`IQTWTs~yx&(6EG`7J#g;i3)T~6VxK>`%fx`MqO6HZKFo2MJ9Eb9B%GYK3%1Y1_rFMaed?!nVz1{8Bo48 f>dI6rzzn5%SgAMas_o4n`XVUho`{cPO2qIF27ofb diff --git a/PROMS/Formats/fmtall/WCN2all.xml b/PROMS/Formats/fmtall/WCN2all.xml index 02fef4ef3bfc7ebf9a4da0bfe4557dc1f3ee72d4..d38dd66dd8668ed07410ce4a63b241447989a803 100644 GIT binary patch delta 283 zcmdn>h2`37mJLeGlS7!#Y@Wt4k8|=he}Ty&8>3g&p)wWmZGp<6C*q&$1sD-TYnmJ<%69773ZJ+=E delta 1114 zcmZuvOK1~O6umE#P>Lo^GihV3(PSbGHMOQOZ4#(p8zQCDMrhfQ3P>a6zRgHF2s$VHy6M(*iYUi>{-(fZ;mjsEN8xTbkO>RQ;tWG&gv{5#uj$tB=5{`P^) zx4lOOi;z&M1}7@r0R0pManz)V!Rvco%>#nX{ON8KEn*QZz~l zGY9Lv{bs2bz`Y5cuq+1;;!T${0%RKaG>vdJIk5ApUvYN-M#JC8vMAnPWEX$gSAjzC7+yHvf)!;5JM|QtMGz z)Tni_C$50qz!;^($f8yYFpqXVz}^^f58HLvvL#HmXJBJS!pELE!}gSMN+RuXTy0{X z+yHsP6|qO8F`okJEKN{)A7dGM6lAyUrIIv8850Ic1AF|C2J8ef$ z9I#nSWEp2>@xzHL6`ti?Pz%|LAOpFEz)|Kc?!3+O3K&U1;G?BK7mnakq}Sc7Pufn@x4uv9gLfIL~*cAKGP^L z8KyceVGHBr1EC(9*CcTl_pFTBvjWOrmSWS_}Qc40Io;)NHx(c5`#V!YCrEym~l&M8u?7v|)&{hs&ld4ImQ z8=tx>Tkfp|4_j&9K$0ft66L8taq7eqrc-1Axkx1{QwqN<8YPofahk`eNLjiyn3U5jBvJuoSP^}`w-)3~$7B4X_vuDSw8Zb;_Vcga^IVKR(xZ``DD&_p zz9;am;4yW!3HVDwlIO3-{2>cy2|1g{zd#9SIq})_b*pLL4I`KUp#`LsK}wRqk|rME zKmFakSs1OsVOCR?qS@N3a8%YVi};pA`>3A=xGiw9$M$p%7J10#YJ#VM&H_6HLKeIg zd3ig?uLWXJL8MtD8aHWC7dQodOUD`kFKOr^jRPxEfv2Lu{ng?*P2hWxcFsk8b?}xa zs)d)yo9Ca0{9N++_(tHo$7v;Z1VZcen`Xyc1i!orSlil0RwJdknWxYiqp6G1YBeHGO^Jg}6&^=X&(IBtqdbrX($iH`-;L21dKRi09 zwz3Bsj!UKOTf4iF_8O~>_&5gRGG6;S$!ZF6UF5|=P#yIc(}>nwKu*L%dYyCvf$(f$&ECXcdEnnKa>{@_0Dv~-KZyx6Y0>i zVTahH&cXscxzL5`{&1GWa=eRw8`GuTxnPn;L>KS=2k-G`O$~fM|IBE8(oVX1dS&y@ z;DX!JUMl(bvMHLp!Pjr{zA%T$A{iCvVw**>q*y1fa95dpEdS1A6LqD{T!n{N zCbLzjO#WBtwK$!mYT;#smPfWqTd~ delta 1466 zcmbVM-Aj{U6hH6Wbb{$VdW)Gd-I7pL=C?+XCQ})@`IW1SqO~nIb059VFTyYgsVK5e zbP<6BQC$Q{4@A(7i4}o_hUiV*bW`2-2WaPc-_4x9SMjoU&-**){Lb&3=RD8)vy9C* z8T0E}{BzWl?Sw9fK>&idbw#eH^b@$Tsdwc9POcSoPVA`n)e< z7lkJXNhNYpcmP{InlWU~!S%fJI!+x&;hnk0O^G9Lfg&XEz(wdFS%XwYCm~$$uv|zG z;v|Smtp*#`7(5m)`TGd%qj!Y-TFCCCc7$2X@Lf3ALdzlOrD{CXl^D_RUU> zml6d?W+;s!mA;!7M6^+SvLs^jQZ9RKDig$0ltpPRSJY3g^$#TVM5wE)nvg9U0f=!iu z%Ge3uRM{Q2Q29e|Rpu#}>?@xwPV1*;@Y%DmxrX8#oN?vrWGd`ASIAac4{LUku{qa< zfQ#+-_kuRp%q}pT9=g@(lL2E=shquvigDoOhN=>EbrI6WPeoK7OdHNM6tWkdw;HZf zOeb=HgZBno>c-hx?~0J7W~*~UVA8-1fd{5~g}=StL+W|?3&#%15c|HiU}KVPSlhXL=pEO^_fFZ3ku0!cmtLFM42h6k^? zj_j-%pND?7s*B#lJ(R h=dT)zT6_~UK{feUwN^EA9ZgR?4I@1YQTJ-5<}YEEW%K|5 diff --git a/PROMS/Formats/fmtall/WCNCLBall.xml b/PROMS/Formats/fmtall/WCNCLBall.xml index d2aed0a0f906d15637ab359443e5bf11f47f5519..430c4c545e0a5b66c0d857a2faed6661241c3f64 100644 GIT binary patch delta 228 zcmcb1ltzayMT;aW}BzYR$<&+Fy#~zm^C?o Xk7aYij87omFJ_qJ8OF);7FhrQdURJ} delta 1419 zcmb7EUr1AN82#?m`3E%J<`kXVY+|6Tnx)$;h14uX-IiPKsc3F%T62@RYDQqaL_rk! zk@OVowO*nN3Oxi0y+%U#k}o~^+(SVem28;#H;rGUmbWi#>hvej4{4bv>%B`HoZ3LtKY61cmFxHRJL;64p3 zfd2^I&H+!-0NE)B{5DWKc)dU~xL*XCQgg*~vVih$gGG_cA61(ViVZ?e=-;F%bkGL{p((sMIi$aON<%}aBMN`B zMMQ<_{2&(&Q2}o}J*sT#yCl;UC~3nKcreUGJ!(+y__(>WnwVjf!@ly7`la!C6 zEjpdrcK$wT=GXNV7GM6vr`4^C6&5zXm0O;6$;n$DTV=jF{xP{bT-xZ~6mXgfr$!rb zVNN0JwD>;Z8^UAO4&{$`vs^!lNA2L|cSBhZ80C`i6G`!grhCmkEOAu*@_3PaSM}P1 zvGkEk$-Vk1vp-SJ&)CXq&v%+j1-lUJL1?F>tiAXp+e*c_sh3>jrZXxjBEP)cmP@jA Ki){tliL!rX?l?aH diff --git a/PROMS/Formats/fmtall/WCNDEVall.xml b/PROMS/Formats/fmtall/WCNDEVall.xml index bb1bb7b9d2369cdf623409c8b117094ff7dcb9de..67a50914a9db6198e9bb06f383d0eed8f0123fe7 100644 GIT binary patch delta 154 zcmcaMlWE2zrVYy&C*NS4vUwhp6XWDnCR~%5Se{J&!!mF3Hr9yA0czk!f$a?@0sBDLfb$RJs}(Y|}p zubrc#rq?y&X_~|hdeWI`Kg-Z2|DkDBQ&K)H!*8A0hsW|c98t+&Yfx?`vU0npN9IFM zWGgH@#dYJu{ixs%>i~cRi zQ!v+{AA{<&5@~90EDqp4vPd(f+fpr?Rl6Z%02z~U<73s1HzH+t8oY7pboW8v66Fb; AEC2ui diff --git a/PROMS/Formats/fmtall/WCNFSGBCKall.xml b/PROMS/Formats/fmtall/WCNFSGBCKall.xml index 4c5e055f8a4b6dcbeac8475091f6c84889fc2008..92a63c71ce8f906dd1912f773509a3d9f1ab0f17 100644 GIT binary patch delta 289 zcmX@KfqBk!}MGjbf0XSwoB zRuBo;{6J(IcC{N!l=O4w7~e-E3pl!noPb zXdg3>mBBOlhSRrAE?Uf+!`$~VO@8I8H95uhqR>|WD-OP4Yg>iGPx# delta 1690 zcmb7E?Q2tK6hAj77&hu48!H%|oJ@gZ5~mZ&OMYi;E8j92#NP6g6}1ui24opJ2yh&vNAM&OVut7E zd|H6Nt@2gI;W|U#lHCM`G%zX^*f!uhqLQ0JIg?O};Ne2|ajAWwFNq)Dzp8I+i^3VF`rLu%9znk$`&~(OlN5ET1Bb zgGurZmEEeiv?8lCpRe-$`0v)J=*Yr^Hg;P^)PNj-EvG6Tp*E=TPdlAH_Kez- z_+P%$;is#jBdA z!DTIVhOLLB=*06CXgYb`^ow;Zp;8H1kcWt5`%zDU;lbJpt-x@nZ;iXa@Fx7oVZDiVvvRAk2^Tqq>pFq8V$xBiLbv$kw-p*M9rB*Kdr<^#Uv&G6!M>yp1r%@R z{&Lk8L-b;PLl)-6{fDlmVwf%pVa|K-T1ZZv)y3oAZ)iMsZwb#meo|k|tHbgF_bT^C D<-?Lz diff --git a/PROMS/Formats/fmtall/WCNOFBall.xml b/PROMS/Formats/fmtall/WCNOFBall.xml index 221221958295b76086b8127eaf88c7b2224afb75..b163b6993f3a6d2020666a03fde85256b9b38945 100644 GIT binary patch delta 312 zcmcaKlX*)!^9C)J$x~R2HveFm$2nO|QDE{fzKY2{ntYQt@GDG?@#32Ni9cYnfvCXb zHv$}+PYKLpoZKR$GWm{>$>d`P`6ed_ADf&ZVg^)@wK+)4hH*2W#1E0pA|_Fclk1`^ zHlNXxUDp#C=M_wwZ@JE6n*7F}Z*qaB%;a+(8Bq3&%{E@k7~v8Y zK9e?o^QmImyeuq>aWY%rl+DKix3BgI#b0LJ)>#sHUe9d=MwgVTeHzw$Z;hcpv~n^cJBv1-f7aV)!spfj*-F z?S{IlO7M~=Nf-(89uZmmUCCJSWp@P|FkH@;JupCE3iMNOCxITOCqN}e=q*X#(KL}- zK}8$ARm3ffYQWtE7F=Q+PE$~zjarEiQUDGLEFK@GRucGXZ5duLR_AeoF|0jm#&KhB z{T`wm7Nld;CU1|osSvX;3Bwyo5Ef_aCQloALRjlCm&C~$BhCTh&wYtZWi%C4vC?HX zq+&NwIRt*vMi$Ufp|BGl7S=erC~24gy98O@v>H7`KuH0~iSUWkK?At(U18HY6{(vt zLgX7*P<#hj`^n}bLUBS<@cLs5PD~ncwdpDPO?G`f^q@Oz!Oy0R7PaY&G-93*Mz_OO z)kWF7b-o9Giz+i^MCO~q#Y$4s$MXa~s$n+CWQ&TCa&JFGajw98N{h|+MS%{HJxKLJ zV*GqiUa=Gh$rcy=d%;24a6W(LWcD(%egDcGVi${=B)qw7DPMaJpLLXqc0y1HMv|pR zz(se#dJ>)&Rs9*CI)e1@(AH~X&&=PK<43u4aat3Un$0-YVr8R_Rtd*D8=2p}B2OE^ z?yQYS_{g=1{cu{BYCV)Yk00dnEY?rC3TIb4(dZs!(_3aGZ7{pma!aQ*5SrID7~}+8};aRO9KLE`q#@U+s3h`Zd#AC|XI+^) zk6$SK!15Cmz$s@jroyH8wPgcN*gEh)z5!G2IL_>E#V`BLVn^SK>^^5lkCIY>eOrx~ z8Y#ltefIyY#%A`v(WAGo6jQ-P^lL5193fuPiF5KAtxWhl_|}uVxvVI(oBT!$!r*VR zb<;J#Z$LW4B-|=C9Xi);k!jgO;+pf44_IaM~ogymNqB5FAO6#GPwl)V}n4@VZ;A>Bh zzFmigQATl9hk-GMu1Thr>4rgL=BP*}bR{o>X8$;FWaJbbE)*Cg7dPk0=PNS|LwKZQ1xlHlrDlIt)26d@t{koZb=6gtPT6K9Wl;~&LoazC zDC$9q2!c?)h$x~6A1r!^2zm($f*v9wsQ3DP-@P|CTMu!$cYf#3@0{~H=R1zy$apxO zG5$TP)ki(lO9|RcI=(uUk&oJG0MZC;pe1<9C`d6#`e_gr&G;)uO|TrosTZdxg=m-t zd7D3vFU7L?YgS!p83mw803#0Vfbx>(s3GOWjyw+L<%pGYF3jy{q9cHd(qWi)0=6HI zjv&K0CGhPtQ*ouPUC^nAB zveXb_4nZqRmgz@9g+Y!^T`CJ1DFPbeoV&4@?^R~=mZ$UipglWN7CFd^Pv!AZ`)+<+ zK0B-=f1>mPO=7p>jpNZ(wO-))py~N5ei*svh}4O1KYYCKQQ3$I`wOkm3zwrPFM!fy zA$fz@qq-1=mn5)$`T-hAIOo438e@j--V3LwXpp zAX13|Ey@#vAhra788wEbdAJn^BkFtbV$X&7%v-eQ-XvG=+w(mH9Z@{T|?vk5K zUNRl7ZZUXZt;TouKlo3lm$NwGDbid#;3=M$+jyAd}w`9kbFB z90QY-77&vf7J9SR76t;dh#BxAvy?oRK9iPv8k0bK3X=wT7?ZqH5RKoCSsH)~t1N!UhBKs4e_ z4@%}zyn68>2zwDP>OZh2Z@um71{XP`WI7y|@{^PAJY&d7U;%5WqK;K&OK72k4Mta4@4?0+#vZW}{~c!6iPsei z%ETWMO(B6LqAkXoL>szSeb)n2&Ywv7-SEq3a=+9SihBD56=lYcjJz@;ilZr+-l)8> zCMGK^tD?!$DjrZHPZgVQSw~C0S!w^Pb;gM23Eaan2PyDD4L(8f&B%|j*V6%7VMC2W ztsNj*B)UqhsHbsJm+j}{{@rmiB=1Lum3Pkqx)R$QPU7-c=L||tNzCB_X0-=Fevk`9 z%dBowR1c%80=DG?Y(aL4JXx}3F@+gjdl8orlMipB^1WmF8}VPMSOV8^jV4#If=x*_ z(mmsrG^1uOKO)7O!?Kezr8s{~q22ki+<9@-|9mN%i)dN-+n$tjW9HdHf32SO#2wh# z_iV47mf!8uM+PPz@9ZuF=iv6eRi~kbc6b=-bkqr`eLA@RUqyx9a#6G)<^SyLhOI@0 lf#rQy{Ozaq&>^tZ-J6IPxX7BmsU`M3)}k5A`G2-t;~$LOq*wp| diff --git a/PROMS/Formats/fmtall/WCNSAMall.xml b/PROMS/Formats/fmtall/WCNSAMall.xml index 87cf1295d8b1ca5599c8fcad870897b8fa3ff4ef..8f5d0df84672632a3d0d99d85f22e3611e5aee32 100644 GIT binary patch delta 273 zcmdmTgmunt)(r+Mo0C{X7&pIRoy56$34a^&)O0X+=*%P z1gQ&3lUo)>Oir*Ex=@~FHYWpe|#wlP8Py-q~8Lu!wRQdTb8X!xZ2xQbk<{N}D W`Y>+?+I@rtL`E=fKNHWG!2|%xQf5N{ delta 1180 zcmaKq&1+LZ6vgl4OGK@jw5G9Y(?lrIT9TMFDOE|WDWSGaO(PK$Bqoo>ue7956Bnsf zaidb|2-yfO)b0e~32&hr!G#Mq6?cNPtL}n-fD6yO_Zp%;C6G++{N|i9ckZ)y*0&$6 zZ~T_-IOXXwmFW~^@tq|%#c6_OQI+U8d3biGL-t$RS+AQ$r~sfyGuWC2T%~JRjRG#= z&`qpMRIRU{W{yA_%NrB z1M+IyL$g(A&G8RU9Q=a4vnvBEOLIW8bRAy9aMN$bAKQKMBl|wHa~PMpLMa4F;x4mD zFZBHUMaR++t(rkA@(5S>O(=ot3~Ezq8i|Va)q~6_hxWuw3uV<*q8v{B-Ac`68frNN zl<+Acnn)p>Bh*hp{JQo1%{?tk8gvD!YDSgP)KaZ#c73}KLQ%*?sgEz8aLJ|4FP

GEnON&PuXYD1*v z)wG5!R($+HW$%{F4nMDKjA&yZ>5Ua5A=n&-M2w8MqV{=^ z0!yvm`rT!z7H0s5YwSLCiypi09< zM7gMZim|6=myvixi0YDe;_R!b+n5T&y2)-cHjb*ypa|KFS({*ojJxF5T|b{;DeDJ6)LlnzpggLu}&;qiXo?>)YHRbE(?OPYwV zxXuryu}<6gxX03F9QnBo{>;Hr6F)yL!`$K zRD19}(Zt+2nVr#`h$BaJtX)xHEa(_`F$UH0p&p&&nb@X~wZgo8eN;eWR>j6O@3Tr= zL?y06jz*xY_Mti$=dFn^hv6Tx8>T(1&N_wvVQT)T$X0rtcsNmUWUUO0nJyR!CoWHV z@ucd^-W|b8Drx@|WL6&qIFgg?PL$!-7u delta 2279 zcmbVNT}Yc}6h3c${Hg!Rq9z)X_){xwV@$2h#{N{4Qraq2E3B3f6Ls1cHHoz{WY!{s zAzj#T7 z>V|KWy67^_QJPO&of785{W#9zqL!R=77lToW7Ln6beG>FnOh#Ha45U_p?uaAnG(@q zVd7Io*RAaU55s2;p++c(7hRwDbB-MStd5&cGZ8>wS<2 zg%VeT!pxgvrDuY~N)w^I`IA#_kB zf+RskN+e}DP9Abos~SAzk+G%(><5u6prcBtdZqAWD*JdT>k;yj4`@C*0@PYGax=Zk z1%U$Y9n9lyS7nnEuaFR4jzjP;>L;fo1R;VrNlRvqJ}$QNVwGWS+Eth$vu z+uTmRaWt8AXV)L2Hg0kMk$q=uK~8RNb~h@gnoAq`;IgeQqmd-rN^NT5K9y#NDolVb zaZ8Q)_}({kPXP6jjV4<$mNl2MS@&y+O5&x3ub;0};^#vKu3xVHui@JNS2(pE-KvH$ z4t(w4U4QZC7oO_5c(B}(+AkyN=9leVtvYkYwwEZVAgY6UFZeF%F$i*!8LQi@H%bAfQo!ucGb}ct%N8rP^f9=$!7sQ;(MwTt#fm4t! zJu5y9V#i<;BSx)Kvbtbw(gq5{Nv@+fKIJ~0N8L(R9m>5Ac5};4;&sNX4jh*xo0P4! zYN2WR@>Z{bZ>=x=-Kdl#F9>X6xrn3;XmP%%tH>X~1cneb&Y#VhdE)M7!ZRdtjOuR+ z`*oJwZjhRyNp(SerzjL-1ppyr3W}6_2=p=XwIc}%f`%@Xc8NXLt@9E>ETVl zqj6&~AbvMmH6bvmtrDiwP@!dSOIZ=*Nm$hC9a=sou;k>t`^c9jR5K%f*15ENeei3e zWBBvzA=l4}m-JOy-d^dIK}{r`!j$lgi~5btd9kgHFJHV!C#VISylFO@3*xaslMQ@; tFPEy1JW?wE#`cof(Q8W8A|2C^JMV~Ay{6)xv`5?l0KQ4t@Xt diff --git a/PROMS/Formats/fmtall/WCNTRNall.xml b/PROMS/Formats/fmtall/WCNTRNall.xml index 6deede3a11df1eea4f0f6e34da86264adc439d1c..d3dacc3809f130d369cdf49450615b428c25269f 100644 GIT binary patch delta 342 zcmYkyKS%;`90hQGcN!UT99Eiogvik!k%*?IXb6d1P6w4RI2#%o#7K%lN}|CEDte)q zS4l&Ilk^1%bBJhYiiU=!kPsn=Xlf9O{y^dMKJW21Ke)y-S9I|3^JQAo%^Fb4iEs*e zdKUsbUV?3inmnkQLMXJ)kkT>2Q0NTNm^sGqYMCatb%8;#3kapnP$Y?N>>eZJeg`J| zj=r<L{h#t34HBi>WxFJ$C+|A=NY@=cIT13Sw;BD1L%ACOc6`akd z|Elxs)H0XVIpECArWUy*M=Tf-*`dUFj4$uGEHLkhB}%Vq)|bsV?D1V~cETBdN3~a9e6yU|UFx zTl_V{Mm=T^%d+scEV@ndO*HXGqCV-{d|zUGS+YIs4{$Eo=iJ*X7wLTTp||&*bH3+u z&gcC2KKrxktADGmYiiqoNQr4t6o*6-&!o`AfEW^Ukfz0c(N1Sv9@5lXX-)Ktlh9|y z325T5{Y)5mi^4XKGYfdnLl(#XB(&3zXW4^DKt2y?JA4mATEu$+(mC@ie`jqeEno7{ z%2JK|L!H>x<^+rYI`4qx(Du7-?iqqJ4%>zufU^`5V2A?b9PEoA=yZo))-@bdy^Nj{ zNAX-V)ji@pI6Ul*w~PTM30)k|3=ZpXQ|5>+x~D1fag$3&=7tFZXwtp@U<95F0FMCP z*u=s({N%+PJ#{bc(Znb`rg3^6mdw*2epyKD6fEWvTouwU?4;FbjWn8eD?S|nGYEPZ zF#RSVXBMK8=M(zY)981Gd<4f&pkOhik%#jvogyziyxJh2dyXreHl{9)!x7hR)Fh7M z+z_2rk{f&}bs(k!oeVYx9fYSyf%z< zkdh1s^$xmbv<7TWIOZPFXJ(AH#@IznMv`KdlB%co#TU9LiGta~T5yafH}ZNhbD~fl z%{tO1>geEN11-f8^6$YZ_4Px`rP!M_Z#c7h|5yuseW@9%qfV|Kdt3EeTPa;06YfwZ zh5Ixm+U4yJpElAj#*W%DW3n`(S2+b#n(3wI#+6O7TbXm5ugghwh{9jY(&~@<BK+^pQe` zT#aqKSU8M=31zL*QA}eBQb5x`mmhU#*bThI`2wh9ABB%Ok)ffhe)^!PUj9Z8ecllq eNSQa+FhaI&j$WBr>r~{OYd5MZ>O;^ktN#HDzQ=R` diff --git a/PROMS/Formats/fmtall/WEP2all.xml b/PROMS/Formats/fmtall/WEP2all.xml index 24d5ac1edf3dde55ec6a80f892c6980cc2e0e63f..8f5e5743cba63d2909835827a03dd17c44159199 100644 GIT binary patch delta 189 zcmezJiDlg@mJLf7CtqXincTtTu(^oYhHLXDUM}Xz5`tZup9qREZmtqOCpY;7BhTal zqom0-Rsxd+tSu%lbDKALgNxJTd4+77rA&U9POi(6n!F(E+2jXSER&f`|KE*P5 zTB*wBPX!{3AjV>cqJ`VrU4>EE6=>b!&~C9H%52y3$lc zMTF-l3p@#_`zGTuA_|ba2ebeziGLcmOTcr|faZX&0_}zMB+wG}MWA_-vGSa2puD%_ zsjPR4j^ioQrpQ%Sm$9w{9nF%z!kf=MoeR)QA-^QnWoX5qW);Z~-CjO$wi$1oHKjd< z8gJ7qOs9~19_h+-g8ZuW3GcSLx(*A(k#H6TPD8W+(OhN5CA`Ln>$JFjw1Y{MSU}o` z9p(^KMlq&`S!~^N7Kuu>E>*4D0Sb{u1N_C|;RhiHZ=ZA+^X~obmIPfvXHs;Fis*cl zHzLP49&_@Ipw{B2Q4~>zOorb~`}pRy6Z}+n@qWb5iSZ4iJU9|=Ha&SS+u2ulpRxv1 zKz(xJjaurRFtUN31@oqa+W*7lkJ)cy^)c&KALYoULK*{?PeP7%6uUIt`G>IpUHSSj ze%=iA8wZQ;Rd*c6db_Q5@k}9LyjyM)_E#_So8BpmFJr!%Nkp%i_FDBYEzYY-bb^rhX diff --git a/PROMS/Formats/fmtall/WEPBCKall.xml b/PROMS/Formats/fmtall/WEPBCKall.xml index 6380813e49fe3f63e46b02ab82a4382092775422..7ffb858a3ca438a797b368c0119c4c77275c7bd0 100644 GIT binary patch delta 325 zcmX?emif&d<_#7+le2i@Hvi(;ATXItR$wxpT*c%+;XIT5Jh&!vJ?3L~VMt^sVMyGp zFF%!W@&g5x$rg$xlh-NMZ2qTI!npaA$}FzQ2jqArCmfhI`GdoqO@~kP}pFyonFx7HE|Z36=F7l)PV&yuZcUuIC({a1YD!B z*5;JN1&lx|QYP1>Nld<{%C`AdG8fZikub!kRSlhypBCd>G70iC8Xxgc}PWFK9X z&3##?ST^V7TQE+}%U9X_pkPkI=4luAu>uJd#?4c1Tw;Q-R@^xQW$k%z49Yt8gpCOR DODKiB delta 1583 zcma)6T}YE*6h523h(?-AYUwt`!lt;X(8oO7j%g~Y|( z%}y8~k^uA*xD7^Oh#oHlVUoT=^!Agy0y4o$#|Ycel@b?@vY{jWhS>-%vhq?$&BW{{ z7B`&{k{zLMCj}88?nVl(AHBJHd{UKwKi=%ZmhAXAqYQWi9kYA%9TbO`?Aqu(MAi~=%_cCc7oC;sWZ?*oP%g`>cmOoga&VAB$`##ukmPuUV;TS zlUEXyrNLI8L9Cc=CnWK_aO-<0o*>PJNlfK_Pr?Pyfw)aRF<5p*i;JH9ssO)~w;Fh^ zf@GuAo$s7!FEyL<&&2t%bkR@|AJ2x#YGe$tfdz`t>dY6Hs=r3Fqph4+Z9z?iHT|FL z*qV}tmfC~(%^HtO))`?x>WT{s@Pf;hXWT0Cwglxm1VL?Q10^s<$1mnwcQrU&w)a1t zpO)q0YQ9}eyDv+4R^&i=k9ezi$h=~s{hF4!cLK(Z_K%|Y*iFs$4&Y-?HWM6*?9IP9 zoFVebTQiAjn1_$w`HkqrSyN<^9x@$vR)|x%vz)jya?D%PMtjA- zq+Z&)@OkW@o#j6!?Vfnmvk{$KM^|N)mG!sa`aq6Y?N8PGsS@i0&%1Taw9!V22_VdGW&wtv(X6 OfY%A^3g4+uvD%;A33~?s diff --git a/PROMS/Formats/fmtall/WEPENB_00all.xml b/PROMS/Formats/fmtall/WEPENB_00all.xml index 5c93aa568c08528bdea33fafee810286032d490f..199efb3dbd6f8f06e597fae007ea0daf2e02fa0b 100644 GIT binary patch delta 49 zcmV-10M7rGxdEKE0kHT1lPUrblbR|Hvw8xi6SHC#b|#ZVJsOklJPMO=J&_rIfeeM{2eCnFlNl<3mgNCi3Jgv_Rx(32nu>6sgFwDdWl-8I cZ!0e;>d%k^v<&1;KcHYa*ckK8mSK-s02Js$B>(^b diff --git a/PROMS/Formats/fmtall/WEPENB_01all.xml b/PROMS/Formats/fmtall/WEPENB_01all.xml index d242efc2e56ca17d8252b70bcc0b415094a59ff6..aeeac95f6bc8d4b1511fe18ed1a60cd8f3b6b8a1 100644 GIT binary patch delta 40 ycmV+@0N4MlSKcGkn zLn=ctLkN)N2E-tK9!zv{y@Kp!8KxD&wn0Fp{tV$jBU6A1G8lq^M&<%FIs&zN07cV* zVgW$0BA{3vP=zgn5A|M1Al?qm90935NfL$Ku z50HTdlTB?jCtKM_u|q{C2ishC2Dut!Ekr+v4N{xTPzkg?4{Wj%kd@4kjiw?T=wwg` hr7|dOR=0JQ6!ix>F9jSBen7!;urcPFQ^TIK006W*NCf}@ diff --git a/PROMS/Formats/fmtall/WEPENBall.xml b/PROMS/Formats/fmtall/WEPENBall.xml index 5238ef5bfb1882822de4714e18fd60cbd891a0d1..5d0602959684542156ef7060d5bf03f8d04c93a2 100644 GIT binary patch delta 326 zcmaFS$b97k(*_Op$x-Zan_sc(2~EzCIyL!?AK&BxGmgnpJNYL6Q{|Yb+ePX1mEO7*B6t$ z{CqaQb8};yEMg=!St^%jvP@jUWI1<%$)7xKP3F=9+TtrSS;;E{&VJxkvw4E|GDfJt zy3JmG9*jU^1ST)=F52u6patR-Y-S7k#0(Ri><}<*vrTvhWUmV2<~v)qv4B~V9i&($-{|Ap{B8>$QbLMih!WSc zMs|cgSdTdrq<(lrpc_gF?t^p?vThJc04+{yFHE%C)(Ea`%w*nMva# zAR6!-222Bg?dZ!EYNM*=`G@xB=>=5f+NApqt7brp9ewP^t zkv2Tn^+??9UD@i?NY%c1y%EAqQ%(EE7MYpGj@D4@>=!EOxTV+e#g36Iy#N4zjCu8$ zxs-@}q336oLljaOm4F=P0dz=0&VPbwozn@~HJli&xv%mc{YwV=XixN3F>Zj94bu zX*o=G&=Hutz@KCD2Q4x4$wf(0lVy^)CeKT{Gx?Q{(&k6Wr&uPZWvgs{mLb9jW|(Ac znKRu?hEZvGfDj|&b`=iBeXJmU)bukljC|8G*ctb1SK?>enW+E6O#Vz5?YKb%m5-ZPxAl( delta 942 zcmZuv&rcIU82zU0Qm_Y&g;YT7iix@gleVm-jT+@=nntNolHOd`cAwdgVpHgCpQly9;5J*ToplnM0c^90@=o+2iV)d ziujgsy8yf;!*4mfWDPXdbI zFLU#Cw7&#Bla}FR(miO6Ld|P~FDaU{s2l`hqv&9fW?)!A;dPWMN=fii=hO2ow1g5X zFt7e4lmj{s>;}Ybh}W7d!g`$D&O^*%)nEy zE#ctZ4pEA98sb~$dY!$l+=;Ghl*g1zy2Fzb7x}HTQxTQM(8?MfRd_ug=jx@8&SNc? zR-`KbV)XNkaK}Kw3&WNjTJ7O@6L@E6eB0;?w@3Ef_%_}O(efrG0u>dP5vK@T1UH6V znU?-xlrSmr_aI#7{p}wiu2+w+1mB<2oE@v1wT{mI+}HJ<0wSo$)TcpzC=K-H%5iqa z{TXB%9Wg&bl15xmH0Ewc*g?QoBqc?jLxj1zhuPcUDSxFbWijCtR-JTD^+Pv%5j^R~ z*C{EP!;~Odrr~}%#-0Ux{m3IUOlcvhgyR197bs00OJ#Az*D@nHS*#h#cm=*X&2oX? DB)`s@ diff --git a/PROMS/Formats/fmtall/WEPSAMGall.xml b/PROMS/Formats/fmtall/WEPSAMGall.xml index e64bcdf08a548d086ad859c2e1c7f1036daf780a..d2134bb9a2a4c8bb3fb8226f58a3cd4ad73f488a 100644 GIT binary patch delta 154 zcmZ2CiFsZ(^M+}RlTR?d+nm5Wi)phR8yEBB6wa>A23%Z>n|E=$$xYtH$TQi%MsD&0 zLzc;2S`L%@%q1rOGc?%zM(d90WRpax$@dbtCL7smOmoZN zCEbE?a!b0(=5HBW+&3TFpu;lx*aoG|dRyf4^Sgrvj7TC^SOAaD BL4E)L delta 803 zcmZuvJ4{ny6h61K&?19LAx$up7EGYACcTI)i;1OFh{4v-CQTrzx%OTjT8e24f|Gj_ z0gquq7g$Tc-$fTEHxt9&u(Cm5aQ6G}y^SbcPR{fD&g)aH?cjae;f~UuB%PM1N)x0( zY80R(J)sqN4SGNWtQ~rJM>!h`P=Xc_FVO-b8RTwI5!xfwwYu z*JQtVJKP<0nH>Bve{0ZUOWTJkn}Zt79odW6%!l|xzPF>fxqALIVIA187bcG_Cn(_j z@)_ib$DtMI<$oDDEKEKY-au?WJ9qN$`I}0F}}QEm>^^?HG6&xPVIGaPwStX2!`rmRyq$ zahOfk;k-3ji7R6B9xe{X&GUFH%qM@)G1(mB@_==6iamILWOa&T-zNcFl+L)9HGeuZ96vebh7|OdM%g%09QyS delta 1213 zcmaJ=OK1~O6umQ@CaqG@rt#B|rir)+MX*ux0e>-_v|^fQ5(q^^!em-&(8VAD!3Iq?@iOzHk5(nz5C8R_uSu`C+hbVb!}Dg=v1P4 zYSIK1@mr)((rKEiu$uhpw40wRQT{kGcqj>58P+PbfV%?Z9GTSM56V?{94}?O+yzUE zYB-zJW`D|6Fvt)nd{wH`65gw@H0Tmlwqofl1tJA+#a zUxo@BwhT~lN<+2YvAHA<-2-mxn?JaF9nR4J?V*10S!2CDid&>y1BK|K=*B6EQh>)C ziSZN))h2oi}*Ox!;?E z_aeCBV4ec+9Nm;NCE8Wt_>$XNarP-j6T~@~3$YvB#wXMsLk_9ngO~^8sNXeu-NUKGQe0}(s^|UV<;kCd)j~E!C z-v!^t<`YTP!98`q6&r@N|8mlN6&6071oiz5Ge_bwh=)bTJ?!6kbO@c&B#d3!#;mMjN&I Ha7g_J0U!ij diff --git a/PROMS/Formats/fmtall/WPB_20all.xml b/PROMS/Formats/fmtall/WPB_20all.xml index c04572443b801a93216da264b1424ecc3d61c195..8abf8d899831653aa8a356faa41b00f8341a6549 100644 GIT binary patch delta 111 zcmZ2>iRsm8rVU#dH$P)EVw@}`&9^y%IfQBQ1y+;Ib!^8%CQq>P*!&=xgAv4-{2*Fo z@`~6?aJE(akIC~Aq$VFocsBWrp3-K4q!N?O^QL`c0}?8XoA1oK!vtn+T6~Ua^Sh-M F%m9-JGEV>i delta 633 zcmaELnrYc3rVU#dCkM$2vAZ((GUPL)OwN@O-@J*@gi%p}!4D`#quTx&K8~gVHS&G4p629Xg0_h1q_}*%L9Na z@(^N^1>J-<*RUQ7nJgDCCJ%BW$N*;`odafroZtjxCo&{6WKTA9NZ;HQ#lc9d;>ow7 zzY(prD@tXuP3#X=u;r6&;0>TY1)!(EUPAL~I4~4JW~VYJZ8nUbX(H+m^m__8{``P~5#-`mnId)&3-kPSQooAu|Rk|?dO;vta;rc FOaSIsFLM9@ delta 634 zcmex1g=y1lrVS?;CksgnvAZ((GUPL)Om37C-+YYGgi%p}!4D`#quUkY!_7xW+-6D0m_sB%?3H6fWZ@Jc>qvF z9ztxgV1n@G39KJNCMPJ0$%EVoGQb%~=YZKDCpZDwi44gM*^?a=a^>{JG&&H3@qB}Dy!o=*WspdV1M9Biri=D>>I zZ1UKoj2O&;&=LrZfQmF3Hy1SAVZx!(2&l>!sM-vwvgI6;G#T zhCGIRAejs#Qy5Z#tW2PY0z&{p5Q9I1FGDbpT>@57%uvcu0EGDrML-ddXa-PiF@qkE z9nO#lWGOJD0p;=;a)B&E1~Z`PNkA1KwP4d&K*mj;%raRP;S2?^BfxG2Dg(pGnykix zC?X*7&CTr0jFWk!xF)aQFqAzPZ3fgl+N% xFR971ytpRIc;A^EV5zh@!RL(mX1A7AY(PSVakE9w9VQ4XX2LlrD{qPj698`HNdW)= delta 1256 zcmaJ>(MwZd6hHTFZn{j+d5yf}%rdeN-88qvq&at2xHg&E5P}%j@oFPmf*2*YNaUUVKyzp3h>_sx&Y5IU8IG5Gymn@gXj7dlQ;E7 ze(b7qBKow(C*13<8mi&X?jEg`wV*#f1{u?^SqQTr5b{ARBxWcOtXkt8fl*^2QrvZKgN09T>9U-8~S{vRAKyN~j!tD1d5-=Q5kX^;+* zk1#)~af~XLW{6QNB2nD17+EhxsErLzESSU~MI%Ysh>iO$&=`K_&{|QRY-FmOKAAP) z`DR41N7qp=1vz4za{|Gqy;nPxFNa;P@Ftw&s#^Tu1P@qni`yLa0a`50*OvLuRvN{ADZyX8ix*tTB@90%13 z1WFW_Et3a5zRpqE^xwCXlmoNjjX{=>m%-;I+Ah&NuQj(j@2ex>jYQKCv1g(srAM4a zP>5B+v&HqRC#|H_TOHhFHG6-1xy$+< z+m}qXJOtW2-Pk23i`k1m3%q6yo@sX?i4S2Tjd4%OYfmAd)+6lvTz%yUR0@SC3_A-8 u0o0-K@hc77e|OV)_Mk!kPeusn9%S{&4Cl+kkGfg8cDL9}g?hW*sQ&_^UkWV% diff --git a/PROMS/Formats/fmtall/WPSARP_00all.xml b/PROMS/Formats/fmtall/WPSARP_00all.xml index 3efbe3dfbe921be53540abd6c12623a6bbdd1fae..3e8359c3d16a2025c74e65ab992f717654e10112 100644 GIT binary patch delta 120 zcmeDB#klS>;|4CK$u>*^leL2QHuo@XQ3Nu0COgEjOcwBBnS4QwYx5KpBgVtu&8smZTGxhCfT Y=~ZDTHtz_3$Fg}(%oUlGdpk?&GG1Wxs@dnbMkFtz#DG+dM&C2RXjzOB^9Jlz&uKL zj3O49sqt*WHiX-x)Z%g3za8}UteEfm3X4-%V?myfB7qrFxtJleNwdscg}JhPss;OY z7&Yk}JjXU%d1YT+cZjL--w+0oX7vfwkuE7CtHKKH>tdGA68kTkOqr3&Y%oeVG%bIu zZuKjipbMK=p@N*zL{$bG!6?QtWu7+?kxYBgdl>rBGZ`m5L(mhtQR3T0oToq<9m%HT zY-^lWQwiJ~ll$Q=DMY9Gj{Dm*KlmXQlNWdU<(%IykEXl4GZTLY0?pAE*lC6m9r=|G z$?w$(?^bfLqr<3|clJfAKF4W3Xp@M%v`6H%eWA1Aj(oI3lC^p-JKU4r4i^bVx*Nrh zVHhL0A@7S1Bx&`_US+hQ?Mg!Lkd9mLsiW-1=TkH}Z*FUnfL+5L^%iPw`yoa>sIve7 diff --git a/PROMS/Formats/fmtall/WPSARPall.xml b/PROMS/Formats/fmtall/WPSARPall.xml index 179fd56f653e1ec5ed20baa1cc7d114676f0df0a..4661eae0a81d665e74c49f7ea48cb2820da1a488 100644 GIT binary patch delta 247 zcmdn?j_J-LrVZN|C%<4!nw+P~v$=z*N@25y@;b)NR;qT4lc%UfY}Qj}W1L)|VY1mn zGl_SyQb5k+fKs{1XT0P#Z!uS5-2BVp1`|+JZnA;HmdR^$I5uCfiD3Z?2()rdzT>iK zvO@sJwilip{6mdH=>Zde*)1=b?MJW%|RdiAWhRO_0bgmZOQ@b#i~F(dfE8$9c5|&GdwqvE3M$4G6TMd#{ zYDfKADa@Ov>c!z>6E&AFA`T82F=v%llx_;&^LW*%sk1ss$Ele@j*ec~%F~=F<%jb# zY0}BqMBGK1pae&P2ha}t#IueUT8rB-2*Mv8wDHQTOI-U@=aqc*n@-)+=)#{@EgzrD z6~)if6T4hGG_#&+<#1#->-}Bg+u3DTk;J_5$dw`g?)&OeiI3k$f*kJB#gSM*6ZT-i zT?Co5(!V6`4*&XZC*B(!aU)TTMe8eF87?L^svdXlKPtzA>}1uCaxHuGCXiV?xX@@q zAIHvw`ANhtmakM+xuJJXxs-4y^F?#zRAY8~O^lFIj~nP#ImilZSao9147sCG#XiWj zS1|(OC&bodp|ZlskH@TrMwMxtu1jV-a;BJNV=2sWtC^G5p{lV0R42dCm@xU2=7Plsv_vNRSs&QE#-4?Ja#kVFLwz+}E8yUhjhSC}S0FyNc)klQzz tE!AmqN%9gHe=}R^CFaR<>{KSZMQcp6W7|R zch^-l{s5Bs1^xkz+a`Xjx_9Z$^PXtxXc{vK^X9z!aqhW?!^^7Eb*21E`CdnL^oGVL zMe|f3l@j<(kPFBM$^%W4mpbvdsGo-EIn^UxWCY2;ee$0SA7zoLQ3g37R4Gvor*T9X zsJ4u=0W5@f61VffHS+eMbQl*!z@mvCZ~^Bfpm~`rzO@^a&)z%DePz_$`w^i5ilR;m z0a?^d&>|AwA$0<123Qc70Zikc-(K)v&(_;1+-Ndt79|Cz2)@OXhLxFxnC!=|x?6a; z`}gYt>9_Iswez8N4)-BUD*A%~c%^88ce75@-lN!g#8bn6LiXB9vf1E0s^wwNvpe9i z>Ta@ve5`hGW4P6QEo_>un+cJ{q82f-Sbzpm64c2Z;R_Mn^@wQRZg#Lf88oLOKWeN5 z`DCWQ*M*71a&%~4M5|exjmm~^G@k+{bj@)o%FbN7^I;lE_yW$6 z1j_MKw#D}!6>OH{TJ=*Y03WDrZdXN&K*eo_bVvHu-9n%N&c}N0O}7~v;`2V0n^*j- zkJyA{zW;KSW*r6VBz>{0APVP+{}K#szMNZWaRgw7l=QP7;8(e)AsRHdOWr3}Zwt>j diff --git a/PROMS/Formats/fmtall/WPSBCKall.xml b/PROMS/Formats/fmtall/WPSBCKall.xml index 959c14c6815f1255de93f8519ec42d59f28d9270..87b975411faa553d2dde5e3901363ddf44738687 100644 GIT binary patch delta 315 zcmeC0&%CIQdBZC9%_1CejGLEm`Y26iJ1#UiN2hG^9CyCS3*0y+-#E!P*+G|Ua!e4{ zTS5e10S*y-#vOpi-<^y$XOhD@d zCJTh|O)el&Ptn4^gJ=#d~Dw$Rv@9mxOvUdMJy0j&*^{60AY}WEC2ui delta 1565 zcmb7EO-NKx6h7lrSAzQU-9c|hKE!$U%zH{G9JVAtbyqR~;{m!}H`OZ1_$!+KAy7T3; zd|vC?ce0CmX_`z5(`l;0MkylH@0YX0eK36{8`Vqd4CSl=8tImwK8% z;_!MXh^-WY%wT(3yU9A1weq*R3bntWy(;9V2}Fz0IKYF5I)%r;8FN^r@EgrAY1Ulq z=uVBBp+0yAz$HeLz?wKPOlcmdE9LaHVm52jwH`VLn}I#SMiEtWhV3lYew{@MdC$-| zx3#%BI9AB3n?-ANg?Yk0&fbTmTv&JE;(0*AI-~eMH#v9~)?U0bcnqCN2gr9}$J8oxtpkkPV!CPDW32ZSJ)Z$ zz;_&_>Ids2n8bMCRvG&~7V&4_ckWp!st{?rflBJAoj700I%)Bj_9(M5ld^`9f2IUn zGF-{`11^5vcxF*DvzIc94T9?wU4~y$^9)i0au7A8&$jwxn={*iJNb&nQR+mDw8T}v z8w(sf(%_Owa1TQ6B!b(8%}B{V+bUJ=iBIJ`W**Ad)uWW!2pENInuq@xN3q9dm98l}LCUs&(>fj#x`FCu%L4$w#eh7;c_lKH#x(jp7dQ@`sg!yfo0N-lbnVc1U0pGi$JMsXXhz3;u5P=#tC9yXW7EB(L7Zi>fFQ@@4LlZ`OH6m^Z2pp^!nipn*@GFv S`j&o=3CLn%fpF~#gqQ#{>n^$g delta 641 zcmaJ;O-lk%6g}fdEoxISNr|M=BEvvOag1nTrnpg~Bv(2}Gf-`{<%4lF71=vc zyIK?3p#6lkto^;6rr3jZNM1rwSCEEoayOnUK+8=PIoHJvzZ_L-qQPo?F7@1gInIv7 zVHfY1+ZYk~nHMSIknF4MBXqB7lV3e?gU(`~q;>jua^;twIo}*#j6_xRO-(V4m2?Zs33zO7-(WHP@^MIs|Qdt z9Viw66e|LX!vuzoafGmin5}?*1pvKC{8}0Qc zKXBli^j9~@H!o@ z2Z{v%#fpGpd6N|bL^sFq`v__(Fa!YwQW#1Zl7X}jP+=ZeQySRTA_iLqC7{hk45gD3 z^?WCPQ0O2{$L0fyJ))BjD2SKgeS;YgUQ0Snu>_P zz@c`sq3v^L><&w2s02DE4``MGgA@Eo? k`U8EH0*)>}pkz5X2u&Ca87vu07>pSV7)&;+`zJC301X>-n*aa+ diff --git a/PROMS/Formats/fmtall/WPSDOM_02all.xml b/PROMS/Formats/fmtall/WPSDOM_02all.xml index 1748ddbba7dd068892827ff3e163f82c9e05ce42..39b2514e19c66fedeb14662b63cbef6341d3959f 100644 GIT binary patch delta 92 zcmV-i0HgoP_5qIZ0iXi2G6K8-vmgW}4U>ow?z7Gk#uAg>D=3rdB|?+lD=4#qCV&)^ yutE@%z(Wp`Ff%H%raKx0lPo|QlTJY9lV~9#vz$TdER&RVBD2nJpa!#)b+!fPZzf9s delta 607 zcmb7BxlRI66ulrwVqCzjz!(Qy&=|rJHwqCLF%}94B*c<1xQ=K>(9r1*n3(Ga_zg~L zY$X(agWA|>Y%HuiZ-54E%w#6_ojLd1bMCwPG}XUMx8|`pDYQ>zTBSU`d6Fnjn{*7c zNXz8r7kS{$d~b3|lmJ==dP-STYk0-E)I#~gKC0I`oITz&s7cB}Rsms;GLSt&V-&6H zKzD(qfN8)=d@T?0tNooNd-v>bGcx2=C}gN$@X-Msg%0>~dxW2@7X8Ul>-VG~rBDT= zB5hzq$r!g|_|-%Xc-E-GTT?!Mn27y{uTM{2402W)_K3*BbHkIUg|OO8R7NfhsjBRX z_&62q<&&62uZJQQxzUiMGc;>>#A1x?k{<$6Q?UJiYZ+pQpRM5;?g~3?O_ayOZ}Q)U z3RH!SlA#|@Hs>cn8nptO0as5Rqc7jc2ff5bdC zw~0G3ZqAcb5ttljFSYrG<}TgI7tED5UkevvpBxe|HThp0*W_)nIg{VS7l0%tUkjJo sd@o@M%j9QiDx3GDiZE_|mR4r6dC5{0#?5o)M6f_uc8lDYfvgy20GqowMgRZ+ delta 937 zcmah{O=}ZT6g@Kco!|&$jaWlGrZ8Xut zJ=px(h+_c{(IV=K#7#?HG)o~jjv^Widf0)B3KL&om#0N0c37~_bB9=k{|=)~;vViG zi7N3uqDc~$i1v8y5^edl>h29tvFci}7PCE~ig}kJ)V+rl_Ew#{!l+Kl#@NdFtD}PU z@Qgn@5E00epDw*ILaJ9=9QQBJJy4JG*$cilrK!de8*M7LN#J6h>IRnlpv@_@Am5FQPlW{!4 zGWB|->SB|HYG7@Sqlp6%%iNIl>tE6_J$E-SLG6HIb+`d)N0KtUerqh`Hy5k*C}*X- zDhF%Q@m+F9Y@QaydMYvW?;p9suKz0jr#XjOpbQ63|B_eZ4AiD`8AW*gu6+IYptxaWW(~oPKVi?C+)8suF9T`!CO8MjpR=6-t~Iyp0@YFiX2L$TBTu X$o=<=XQHR&W;xy*@;dA1hrIb4{-eXA diff --git a/PROMS/Formats/fmtall/WPSOP_00all.xml b/PROMS/Formats/fmtall/WPSOP_00all.xml index 0521ff1b42c9592db72c551519a486d278df53da..20f15a4070234dee92ae94c05d4092311d05c4a9 100644 GIT binary patch delta 250 zcmZ4Xm+8s}rVTF`CrdF2Ox`8Vw>gWchi|imAP3{-8AAUYCMzYHP5uz<2Bs&3xPWQB zP!BMDA=C*>=Y;Lr>=houIQdY-6tKXPNU(;@Em3JqU;&p{9}vCyRjdf}W~IbwtU#p} zlSR_^fJL=39x#HHrDQFeY|zLu*&tPK@`UU|aQ2NH1Y02w!OqBE16MPvUbqAX#Y)SAl(?&!EAeIe8(I@a74j7K}KIIUY6@B%_JP2w-3+FgSq&Cy^n0 za&Lk(Cn$hIfFh-n8zT)TPYK84!OeUTX-qgQ2Zhe6C?DLin{}c^n6XQ5wvU_6id|~* z@i5EDd?|Zy$O3KMl==WyfZR{JJ9z>t%j5~69Fsrgiphi0BPc;Z(g}zS^1Kr;%_IU- zO!nl7neLN6q#qzz&yx(2^lYA($<9c!C1V6L<>B&hru z%7DRE1cadcnhMW)px`r@%$%#Kh{(w})J|5+eeOyi0-&iA92sbl6b{Uypu#7WL1{B< z-cl=3e_*VofJ+%apkO&TCJiUwUZ=kK%nA`UtkPziZ?BVO6UU}gm%#$6mx*z+%r*-q E09t2Ah5!Hn diff --git a/PROMS/Formats/fmtall/WPSOP_01all.xml b/PROMS/Formats/fmtall/WPSOP_01all.xml index 87c452f1deedb95f33e1be38f837bcd75d19f74c..4ee3e679a8e507efd59a07d63edae20cbad04dbb 100644 GIT binary patch delta 236 zcmccfhw0G=rVY;+CrdC1Ozslr*__7I$G6!`kj-gwLU7HbkSZW$Hu*}3$7F}l3NTwJ zY}e)wVIho@o6;;MFNlZ%3wA}if#}UzQE5zIfmbm;V1Ws-BFtdMzk~!` zj6jCPWS*=glMSj_CI{pgOt#2A0A+uGi=D`Yh&{-=1s8KFSO#W06mFTEP$V^(tB7lI lPtl#t8;TcMO+K;E?8Me(wwkWVcc}$F(RrXjg0RWl^WF`Or delta 1349 zcmaF#f$7d4rVY;+C0!X(7%~}37+e?@ySmZg%lMS{DAxt zhE#@Ph7cgj4TwSfJecU@xdO7AnV9`P^E2C{$}CJP3ePd*dm zMx@$mBGs8sJ{0Uhv|5J{;@sL8@{t%bHy4J6G7_V3^3kxV)gC>wx zU~mG5b0S0bWWjK0PLNy(P^5J7#z6ha6T*oL%EBni&3q9lOhh@eFshkIb(WiTqJ@}= zQVfjv%_VUOtooz{fbHaqDf*N7Qg#t-$-k5b#Ki_EDT<^on{1HJGx&$fKs$G zkj??KL1FC#WG6Bt14BPC+kNu8^aCWRf0RL*`fHh_sXvvqiUjw(B|)wGa`Wp`w%JbDz5s2vukb2Zu0P z$cF=q3{a7l%AmBFId7?zs6Q|&Qov=GA5gFyoJ|ZjGj7#n+yAd}PNg5a9T0wGmE+HCTZ5Rb_Lp%q}Z zQrNCd;USEZC#6|T-VhN37Mm662BJ4xMWr!;1%Ac&fCU!BiZFv2e2EFHKrLUuoCoO- z7=a9n$ue0>COcHKOisu#nCy{#0LuOV7rT)Q5&MvL3oaH^unf!&DBLo+ph#-6R1w$Y lIYoCiA1GdAHTlXGrOor!$*^s{vPFRn%41^OY_i9K2>|pMWt;#2 delta 1343 zcmezLf$7a3rVYOsC0!X(7%~}37+e?`P^E2C{$}CMyP;Prei6 zMx@$mBGs8sz7*_1wAz3W;@mnhWh6%7!7lacRl#NlAo8=->n22&_V^lMd>MS?gL<=z! zr5G6Tn_J=%SoKK@0NcqAQ}idxrR*Zw628<2#Ki_EDXOF|o9vL!Gbv9@9+V$I3ECM* z=YZLupmqYX6B&|$fnS*IKKWnz0aBEI${P+^wJptM;yZ>g22KQI@&j)SSo+0QovQumAu6 diff --git a/PROMS/Formats/fmtall/WPSOP_03all.xml b/PROMS/Formats/fmtall/WPSOP_03all.xml index 9b6d20c60062b2419174abab1c3045f43bc2c24d..16b026932d843b720de5164021152a2db8273975 100644 GIT binary patch delta 249 zcmZ2CiFr#K^M)6UlckshCTH<;O`gEdvN?H>X6UFo6YBV!bv`iuGa!a?CcH zB_^-}m0C>xl(uK{rF1cn60^xpS<5DWsArk%ko^Hl8%*Aja{$b~kc$xW$X^AQuPT7) wF_^rfuw`;dk;>#FMRzv8D7JB(JZ-4&IJ7&QI0MPSobN~PV delta 1193 zcmdne#=LG4^M)6UlCBIX44Dii3@!|bKr)d*fx(r*mm!}aWpe%@@yX8^g%lMS{DAxt zhE#@Ph7cgj4TwSfJecU@n*y?%S(r}n=>`Fn`ZI(B4NL(l$Y2Nt8kh^z=m^y60TfLK ziUk10ihyEylP?|+-F!xX$!YSYE+N4XpcKf4R0d}t3#eqWV~F`=8&QtQJi&H&R5S#; z;F0|m?159Z5~qy$k1}Cup z6B)86UyKl*EEmba36c*1ik43Pn4~}XM7SFc8zzQZZgz`EVZtpv`B9V?ZrRN#(L&5P zq=CV`c}-jbD-P+uVV09!Qug4G1!*=*eSj-uKvC(FzHIUYR+h;Md2;fgBm_zW&OkZ` z%m#&k6Of(AkPHl$z-sZy8?p^1t7RM@S&vjE>3aCGNY}%Zy^2J)T_aJw!Q@>zEzXcI z@@FUmhF1{~g7Q`>I7JzNQxkT1Shfa*tHET;T+PXLxl-&<(aGVt&s_<`0oZIONPM8h zQ#de#f{Kh(2Bpo`dG@ZN{=kS!0hbMaK*4gb;|w>KZgytFDrGjgbhG;ATRZ=;ieuBM Q%U}W2tI4?e&jAZ205X#_l>h($ diff --git a/PROMS/Formats/fmtall/WPSOP_04all.xml b/PROMS/Formats/fmtall/WPSOP_04all.xml index 50be3e747e140fc9cf108983fe64b6d9b9760183..831e2b56ec5cdc6f9711b5f434b3b96733d54c13 100644 GIT binary patch delta 249 zcmdne%G~seX~P4?$wB;5o8y??@onxCRB@ba6l=DbCpds{b3@27CJ=9OL%0)|mWgm- zwPjFZ(4V|9On36O2*1eWp;ByfL!=o`DuXJY^W delta 1279 zcmZqr#k8fBdBX!nNmqsxhD?SM1{a1zAeqRZz~IW@%aG5IGI?U4_~d(xLWT+qen5T+ zLn=ctLkN)N2E-tK9$eIxK?x|D$dCh6k;!hRM276ijZxB^Ad5qQBBhfb#u!fi66Hda<)DDgi%uinVy-wJ zVhjdGLM!9uTk&%^h*1rWi8UE}h*i6JUgiU$(gN7vE!oQ^Unu68JfTQT9+Z?p>CYKR z=YZLuaB~8(6B&|$A$c*xeR5yU0g}`=<&vhpERQtxS^2Aob`N90TcXv1{Hj#g!U_(H z$?FTHl_8XXg@c=0>Kp|x?d10aE`>9k`wO4D5(rhGJ_TSH zgF_fC4IQo!qyX>5v!`Tx4_1QJ@ayHfrA+U DSV>w^ delta 962 zcmZ`%O-NKx7(MewOmjpXdqvvN%MdLT-;C3!P}(>-2$q_oXp2%ApJwJ$boz1EuC4Ix z+qO)(8-t952n<(I(Aq_{Dh6CcM0DH5=*$kdybcd6mIkB_cFMLc`l7uL57GG+~uB2s6$+m4W{~0wQHD3in)U!&K}_Q z1wsgr568xv{n{vIiO7*SL#lZaB&n~L)fv_XJ$eVOY`r!mZrTzy!sQnE7Vy9u6_qWg zx+01g$9AF|M^TDW$=^)Lr;0R$RelBI_v8hVlB&`aJXEL z(?%1T5k)(iB;Q=C(#K<=h=nm+r7V}QWsG}&?2s_c+C$kMiOA|;NUUh1EG9bD_qv@> znMDIN?vFBU9XTbB&Rg=eyGDiV-Eh5*Km&Xs`dz!HJ=N~Jp6hk;ttFyLQqz?w zA2xvdY%XzW=X}F$ZqxB-e-HP2h?*sprnY4^b57h$&5=JecG-i=v8Ne){2gBUR6h^)YjRx~9BS*Uz?}T${?T_Z6Qm)QX`E zHWCaqF8TEaHMnC0)Wq{$<3u5J;vi~z^Sx192-Qk98}0x2Zf(6Y{xdy>4zyB3VjnHj gn=e)PO{H&M*eq1GfeFNzELZ8Xxv%m8%jQXS0&J7N zmBmbc&=az`t#uOPW|=Mpbi%R8 zPH9S;FU&l^vU%A&maOeZI2aw+K%@%eb|(QwCf4mKqKqLdP?0}UjB3o&fwD^5TTc^F5S~-oDxjDa3&CD!i>N%Hg`mMiqAh~;Mk~}nB8k>*p_JN|(h4F5Qc1i; zBOQ{;lYt*#(34o73^7JtHSq_)A0RRD!AIxpmPBROY4(OEe1_?V%C)2-1S(#o=8&~qRXBG4T!jR;6Q6`05FnVO!if_lRu!jhH8nU=3*>OIu?-5BU#S9Wo z7S0oYmOjq1UE%SQ;tY&XMj2uer4K4ir?bR|u3`g^IgMWYlrx(`l!oYhlu8g2>EK+U zk;ppv=dhcJkcM3$a-EJr3z}}(d6hJzQ%B)B}C!VA=xxv9?vVfSx<~pZiY?C*5N==UPod)$!Xm}la{U7EU;Y*s<>_! G8xsJ!e?vF` delta 1159 zcmah|-%C?r7=Cv4LkY2koivv1xa`8x+UD96tXOm6D4lFe3j$r+QcE}8tdt0E{0Hj0 zEQlfkZ$dZ(5fMdyK-hIRb&=48;AK$I^L?jb;v^1d`@Z+b^FHtUyywfNw(?V3`(^XS zk;gO^(2p#CvoH|H5K6Qba27r>t2IB=+{+o7=8(huxQ7e0=Wq)Z z#>rCw_xG@da0-4FGH?yIF~k3U7R?}v1TOK^Ps<2WtQJ$Z%SdU6i%;ntqD85ky+ z1s137w50_wJswLG)_jfS6xtat07&jf8VZY}y)xyRN?Jv>L?@g~W%t zX3^*TF5cK1mUqh>BjyY_rKy!*qYC&(+e{YTyb*mWw0x8)uSKa*iraV^Pc>J!y^}oH*f?qDod4wmeJ39L15s z`NWnU5fkk#qA}5Ey3fCMIaQ!ok9&?;DM{R6dYO+Le}Ri+?YSZ*KE^xRwuRXvR(y?b z#QsBsL#i(RPO4+-^N_tsvd7II18*Js2YI!0SMxKUT)djplawK^O& diff --git a/PROMS/Formats/fmtall/WPS_00all.xml b/PROMS/Formats/fmtall/WPS_00all.xml index 9cd4717c99d9167167a7bbc65f25b2537accb58e..b46d040c088b583d7f71bfb77ba3dc2e285e15fe 100644 GIT binary patch delta 62 zcmV-E0Kxy@xdD{60kG@=lO6&Plbj6-vuXll46_gq)FYFeIuMiKGY*q55CpSWGgJhV U^fx4vL^#~DW;v=Ivnp4%1>~<6Qvd(} delta 356 zcmbQTjq$-w#tm;620x%k z2~eb%Aq2>B17Z+A4<Lq#W_HGA%i*D|0k y1qLUewaE0kG%+lNtgLlkg1+lVCFhvuXm&46}F-j4YF|GDx$YJT3&26hS1D UWI^1MMjb@6%0hM@vu0u_1OMO`t^fc4 delta 384 zcmdmXoU!jTB17Z+A4<r&WQJ@s=Y#|O0t&uV2Bpmx9rnsA`UBmX0uCWRpkO)Jb0!Ri T43-Qg48{xw3?`d96LgsYQBYRC diff --git a/PROMS/Formats/fmtall/WPS_02all.xml b/PROMS/Formats/fmtall/WPS_02all.xml index a34212bc629850d05252536f559865193fc109ea..6c03d3b1240f9cdee51e20553bbec3c122228218 100644 GIT binary patch delta 53 zcmV-50LuTKo&lJf0kGZylMn(Bla37vvs?lU4YR5bkS3F+HX4&qHVTu{Hr$i=93rz8 LIJ^_H_)8`O5}yg%lMS{DAxt zhE#@Ph7cgj4TwSfJecTYL4MiIzZkiAb%TIP{Taf62BrWNWH1B+4a@~i4g&c;l|gCq pM6-v&ivA2aK+8bh^aBc(gN-p^Fl4Y~FkvueFkmp*oa?2{3;^d%MCAYg diff --git a/PROMS/Formats/fmtall/WPSall.xml b/PROMS/Formats/fmtall/WPSall.xml index ceca2be326e722ffaefd3d118648819b83cfb31d..a2cc088873836332a96f70ffb54987b41e8d4c3a 100644 GIT binary patch delta 153 zcmaEIiMj6-^M)UcleL)MZ9c^OgliMO3FG7*Kd#MT0uGFmHwi{;_7U=7+-xTz!8f_U zLTd9Ir8_2*pM*=u?YdBZ%v$rCJHHity+VcDz}mz1_y<+=*v=3_^jSRkwk vrynr^S&tYu7hDhnv4FA{E*mfdS)Z6Uo80Dss%v@R!8}>zdemm0Clagx5G+7` delta 1013 zcmZ`%O=}ZT6umQv6cy{(IA~j=W57kA>SP)x=|Ux@DOt3QG_e*JhLDamY9=*_T992!)WuGaj!pS^MVZG<*$0{}YNjl-o4 zng$hdNDN{g?XJ)QTRa!#N41afw9A?ECRj%jbN@%PJD&ln((%T=6{74%VW7v0ve2ci zw0kowuZ`lC2&ZL?MhsKbEQVR8n_Y;@XsTewZD6s)34Ubyd2oLgTesg%JNUaRm1}Aa zgCh6)vBqG{W6Q37mIwVXag;FPFhwP1F7>hY g`V+R?9_7=Y#$;cw322K`I=%+mXchU++TmTl0hTZ7XaE2J diff --git a/PROMS/Formats/fmtall/fnpnmpall.xml b/PROMS/Formats/fmtall/fnpnmpall.xml index 4ffc6e816529d643c1d880c91ae24f22ddbe74ab..94e7cff1c4e839cb29bd5a1e61c140919bc2c08f 100644 GIT binary patch delta 425 zcmYL^PbdU&6vvzSO_F{#f7Y1Ywy`E@n**EnAU5W(2M5V%lY@gO|C57*9E2S9u*vr( z2W8tNYV#1~Z?r8%Lzy<@AUQcnPLdf`F7JIm-}mjk-p3Wo9I%wkD8PaOl4~w{klr}n ziyufTEn(=C7tuDtVU&L%s}x~CaU-FGkazAvz|)5tPaGHC8q6CUu@e^zpPO`FfohI6m4Om{)lgGTLL2F4062V%-*4%)>FZr`yWR4?fX_nqqD;>b0VakMjR)JWmBeb zdR!zc)6VRo3p8=5JE+?a?B!$WK1{*ufa7$DNXtLHcEWN7JL{@)gRocn`T MQlFZ{mGNix4b%O@f&c&j delta 2032 zcmbVMT})eL7=F(=rLv_EO4pX(Q6Sq=8LU5tQo??$z#x&8jUQ1G9bH?X3LTchT(XN@ zn#K6T8*kJrHFGK~%r8cx5oOV_3!Nc`#2Mqoyj`LuX2xU}KHoWGR6Xp%oSgPM-}}7p z^Stl-z2EiEwL3SoWsg>Jj80RE(sYO#s6jZjR%M@$I%$#;l%)w61}RTxX$q^Ofaa*1 z=CRJvSx&s?@(*D(hwldRQ5^O>*0VH(l|;+$thvjvau;8ZIK+VM4@X@g!K0wc70^Hl zA94QDcnqQPunporiB&g3rAY41;z>wx>`b^gT35=xdb^00-&Knw^9)~k*;P4$pb46R zdxECn6oXSY0%Ulp+{^EK9o*%<(CnjO?57cS4msv2Lw$I&*x97bAYv97Whl?zjn(s5 zz|Obacib_=dWHs&bwBEL8s1X)x~HkW7cmBD1Rg0woP_;x;JS!UrnCe7?%YV}9EXSwExvtbp~d zyEr|FW=MTdh?>e8NY8+A0!-WHzFC_gAfE@@7Rs#F03vTiGOhcmnSxNUpPy^0l>D*# z{HROL(44?;0;g>&qfUIw9uDB0M?dD!ZyC?XpJT68F6hM~TX9W$NS=;y>g1(rKkGGL z6@1rfVVQZ&9xmHmWn>?z{j|_t6eOKm`1hI^2YPIxW%uh9ejiepL-B_o;FK{UJ&=%x zm|+~eAS6mbX`13M+>QL(le#Et+v%<|=O}&e)NIy1i7Asa*TAoK)C#@t%MyO1$Yg9C>;46`?-mP&>``^c%`^D7rkx=KWwc+1hT5 z7StGx^OVzHErDgWK(rKF$Z;|n}iVdFs3!z<}2Ym|tOhZH{QEaQcVT}85uDgIUSit`hn zbh!J`#QIl#FFGX1;pyw0Y&s(-K%cH z-G-cGW;)m-q?`CRzkb-7TwXO%VBXNGt%;GX0We5)%$2b5%D1;I(U1q?$fiVH5yk6v x#S$6>G-RloRm8dPe^k6y^iuzcjUH_~qpTVq|0XJ4ym`?2@C8_&&FoL3>fb?MdXV%*HZoFg!qXFk{FX~I5?lfy&>Ci97UOutsc$TxYJ=%LBa z#0n-!RBT=*@t|pPnxMesfb|lS1(sP%Hk&Q9S!50q3|B3}0+n1)&iDezp3L}+ yaeH4KqX*OWPYsMkaM?D-0GKg4y^Lpo?8%HaY*4*DvlxvKMlvyO|1*!Vj0pfuZgYbG delta 1308 zcmah|O-NK>6uqC0CZRSs^OO{EG)hE^nNcEwsBuyzu+c^#ia>3COw)06%ra;S7o{yK zyu={3(B(*B`4$rhEnK^B=PF89ku5BuO)Wa#_Z%{NOpEvU=HBzpIrn^bzP!!i27-a&QmYmz2u-4x=6#QhUpB|Bu7HRrq75HQSBf<>SL(KsSBr8Jo0xmQ{|zB zGJP>8V%20jMghEUOA>0LQ&giD*{%r91Lgs={M1ff00t$1yY1Z^v0E!U;a~^~9%%UB ztB-C_2Wq3JMcK8b@%m;lui01YV)#<}?o^IqbOAm(fQ#;_N$FNz*s}32`@y3gbTXWB zhB3w52bL(cfqxv&U~=S3@Ssg1fy~sDRi7%a!Lef^fNtU)Gm{KaN;8^G0Q0jz;XMi29j_OP-|MHz;y7iq*n7Eq4;bc=@gYrLAz4O{fb zrE8N#4!VS*aZw>Y`=W}SuL{`u(#noR@yuKof1LfC9ke``$S;#)gmH-;iomv1_Fyvt zAk>mm)1pv+wh$=DQ$z4}s^W+-PP0= z+QRd19+>nucxQRQq+YKl^qLb|JJv3w*5403W4oP6F(7J_r9GlpU*GiIGX=TQ5+u^6 zd&Kp;GBcV+a_?f^MT9Tc6mycABt}>&%otqQ88bBM z9?yNj*-9Kj4?&UPFL;7DOLiJTL6_(-BxH0D*&z%(M340F2oFE_e)#_RRcq4OXQ}8D zI3~0apNSVY;k=cFaa(55bL>KJRE9Dv@x3lpK+j?m%7F+byWNO(hqFP2p9bs1^PxF{ z@?eS+52p#KUYS4j{&eEx(K&uaCs55uNJPghU9&ELFB2m75B0cEzVKjS|1R|L4%8Q1 z*lCw|_3@GLzrl&PUxfZ@fbY-v99WukBOGtxQgTB;DcQ>TXI|%3$IDvEFF^g>X)Sx9 zr3Sc~8If|CG~IymB8(4T11R)0qQ3r|V|s+HcPd%E;aUfk?0XL7wFc-(8S-nDpA_^a z=r7wKZ%J5rPg%lXS%6`&RN zX84J%@&OUl$WPf)0Y7|(ar7v5Llgv23uF%CS7KJXU5%9PqsvG>Qd6b=Xj?3??}0f1 zS1VKzkV$Kt;(Xsz#(#8_s&^X_O0JY1P3^507H)TSRqThn0Z{hf|Es|JaUv}Q^cH^4 zwU1}-6>l^|r2X&_ubp>l8|(gkA(sj1KcpE`M1c_(D)J23!K+wc{^B zAwJ(w&Ra%`c;1<(KH>gVl=&fegu0RBP6~h~tmnb0nms2(Mfw!f9l(|>P#;)iRbzUY z_;qi@+Xm`G$bCD^5)w|cHDi4c$71;PBe-tJ9RpDuf{;xfP%KtMrtAfo-(G|ig~*2f z&0ITDkaf3W({jzaz%Bzzs6TjBZwY23+k>z*fxTc1>R0hswcPJR|aBv*GNGx zgdBq$iFN8IgHMWI;WKvYsEK@F^HE(I+d$9q=oK^1_vdiO4%^lq84k`3qsn0VC?; zTq$xCchkb(Xazho-pq@aZR|W=qJG=|wemkWwyBQ6$8tCtDJ?e!PAJ{(vO#6+Xj2yV zt?c-)l6Q{z)ajvG)58vW5H?puD)=+4lA}#IDDa~^b+%n~j_yAI>+SdL zJall$M}W}AE;@EGx_7q+U8eDJr~+=fqM?CG;YHLC%! z-pFS4Np<`aU#5)(e&xnT+vHr0;}(VW`xMfjA1NlTJ2dWBA7;oP-^2^LK|6NK+6nNW z{t$LR!co0-x2GB}h+nw%bW!T}S<$Y2IU&xNG9sIFq*i}Yd}k`pNQD{TPHlQie5Kub zLv)+UGJ!ng)&SX?yE)UY7eiJK5+C^tZ>>{e%9IuAAuq<9$M89QPDHZ$G}snrMIu{p z5Or1i^KJ38l2Lafc{OC}f|6Ct8r|346<=i6y$0HKNjQ{@8F$LSu4<)M#9h-rMp!ff diff --git a/PROMS/Formats/fmtall/vcb2all.xml b/PROMS/Formats/fmtall/vcb2all.xml index 9580f673231038b958aa66ae7ff93383029c3402..4ccb3b9ca465ae1567b6fb0a8a3bb98df777dc4e 100644 GIT binary patch delta 387 zcmdng&-$a0b;A#)&05TIjGOnd^zcoViRRc`A>73@`ArKKrxSxMgA&7eRfWxwVow=2 zM@h&rZB~)4;hXH@;Wl|eoy24TDS^oc5(OqtNa2}$z?W^hf+%Cm8SgNm%imLB zEMi#>)Wi%{1kn_r%jm`g(F8PP9)t;zx@XK-fMJM=Ib#ooV2c%F6AQX^ckCG*ShfS5 HQ^O1Z@L`4s delta 1663 zcmc&!O-vI(6n?X`s7SGbn+in=t%@axUAmN#AW#UVF+k&%z{$u$8~L-8Qh!jQ(HKJb z(`1ZIJVCs8GK4v7q6awY!Gjl0m~b$jym;eajBmEBR$WOvsA;mDdGDL=oA=(lw|m#T z{=mGpE6_oAv85BbVFDr$g|pzKt9dr|StujwFsKlN%V-Wm5~g7sSLYCzfKIrE>jc`u z_&VWTJ?I@ebk>sRO z>Qgxp*?RFkLF80%Q1E+Q7nH$|x0Xb^y&uo1=nLcb3d#mhxD(?Vfh3KJZWa+=5nBKa zqjg#}A*7g;Ky3(jK}RTzXRI(h3D z-I*MuE6qhTej%R@NQIA&k^(kx>U{x~m2y`m>P&uo$jP~RN!s-|R2bvQZ}_&uRH#_C zY$2y|N*BVI!{|d{^v6+NGP!8mn_{|isggeLE2Eo=%(lFO>Ay(V(F%J$8})A=u%{nq zG*edoP1>Rb%$}Dhj1M5fsuY?Dt64+ zPnGD$F2`O(6(@aHbAtJAemrzIh}#jIGQ-(cq3VL01?MZsuP&x8s0LAPG~I z5s?fMG=U6W>^Yf(FKQoLR>|$DSeSMRYK_0F+(SjOh=I-;?z+ZjV&$?kN17w`|-Z5cmAC@|ChMP zLt+c@vDDUp%$|%?B+IeuClL%hQdqy45piS&@#mHXBQc0O?YDWOy-aL%6bMsypYrFV zK`3|19JqHFhSrrppZ24+zttuUyZbF`J(&m|Zp+B6shmqErGEywbb=2@CnTIKb@Oi{ zF5t$;Ce|l+L_B!YjQ!a#>(g5Jf^Wn6wMNME0obz%{%(1K6AMxll_w#XtC7oBsDpm4 zWOd)w#Fpacp@k#SnHr%GQrptX%zZ~sQF7&R6U@bNHtl8KRY#b1fvc;w52_{OwH`zH zeIJL`mV>AwisYwFR7NEn547NCx|xUbUIX&QDAZjW2mJxa#VqHG!*mw1y4y)y*eiT+ zlo#Z=#t3~C&g7=MuT!g7m!&Z>>ZwzcihKHu*3Z3%@zX{}HYn~^C#nB3BTv)wI^$Y1 mWC?EV=`Yb$UQ+4&tLGlPqS6JiG55bKJ5K?rUfa7!W5QoevEN$& delta 2370 zcmcIlT}WGJ82-K_rmod!O=6Ze51% z4jH>Bh4sA%-O#oS#^~s3J!5G%ur2JWjI!N~F&OAB#$+IPzl%NJIkAm$9J`noIp^ei z-}iam|L^`~^Hl75@tb@(qJI+#B`5kVhPnOD^NgO2D0K`IN5(Y8#8KI3OtKv6FWiPd}=ZJn_#|v;l z%DiNbUi(g+Iyr~|G|;4O3pU^R{N8s=t&nu2~x)1-&Bc3O8?6q{|uR^0_b z5@gT8Vt^B;36>zQjW{_wO>LuEy&=1ZQ8?nu=~{6LC=svC)jB72(-OyE4m&H*jXCduxV9fLrPz@=&E zB@t;SelZrI8Eu zRcNnNLQkZT`qO|OLm4_D5^B*rq95O*Fpc9aBg8(qI}NY|JwE2NYYvJg5J?_DFjH{v z^2|ZqBIrCk z0FJ!JlGIygtu91RQ^Gu~f%#zXV;;KYchXI-gKR26M1O~o{g7H^ zQ3H$t)k{`->M<*~8-BO!5e+fQ+No5oCbz$YKJeF3+ixZGsMt(D$lvJ5ztuT=n*xo+ zWRee4K!#oW&~_cA=JlkF!t)3AOj**%1)U%6P>6luI|oX5@Pnn zD%#uz>X1@!zIIC(@6X?B*ROC0`$i0E4OYImHbU(DwthN`jV3M#TnmbK;ZS+mX?$vn zPQ5i~b@2gtJjL|%P9?eTMs?(`DvNi0e7itdT@3Ovu~ie8u&6q7SbR(NqCsquFg?Uo z>0kQ#hNBz8uzLHQ0rjlf<@Ky3x6#W#HQM#04Oz&(%>JC>zHA`CTXSCw@!JNco@x^| zVWX!0V~AJgEa!NiL6@?5i{61@zF;`0huDG*+sK-+A$QhS9VryW-aVEYgS#z z!G*bhWnatr#(3JGA9e2D1piAvBTbqsnHc|dXIHj(-5Tf1|50^in!ELBB`vJaQ@q%u P@3X27%_7VqjGO1NY!RQ##>}_5O{R%y@)~=t$y)M!n^WZPF>a1ie8#x> zgR&F%O|s>hERYvAd4pfT=01ZnVv{d8OKqOw z9;ZDyu2^bvL-C2pbBvTWZz$p7-F%_ZigB|-^A3Z})3%o|PM&kjXY;15Cm4Y|8|KN= kwlACfVxQRNHM@(LK%C7l_AP@jA`aDn7)qN3j!t3%0GnP?IRF3v delta 992 zcma)4&ubGw82xqwIcQRl#>85Z4S_15rA_^jq=<(!jrglcXaWV1mNi-I&o$k&YEWzr zf;W}S)r%ek@uE%?ejTTT{z^H{Sw^3VE zW6w9bM~bLc@E-wL7WgviDiu+QY4LCV?Lq=w9b8p1_>Svipm(p(C?M;f92*)5@b|qB z)hmLnLK9f;2%B_LgzK4m{b}1z&Usx6L2+Wy z=665dx+UqH{isCQ&&qLcdsj1q?AX%FbY~MKq)TK?BuGS{MDzP>P9lvWwn!OYUmEfr zxrlNW;hbq*DAVdu-nHsi4nkb3Z^Vw~@V;dk%PjUfG2+u}HHGKj`P4use3%lLNV$4C zfeAWIaW=j7nl(55{Q3t=)jE%zr8uIoXPA9`8|TgSYyY)@H#hIAo!vwHB%j)9sJl3) B-;@9V diff --git a/PROMS/Formats/fmtall/vcbbckall.xml b/PROMS/Formats/fmtall/vcbbckall.xml index d46ef91455db6fb5241d3143364a8c0a74d8a213..243bb2e0b7275ed6db92a06b200b8bd2390d6ff4 100644 GIT binary patch delta 454 zcmZvYPbdU&6vz9`jA@%4+i)0bF^z4LHnvGZ+r%bqn}n8d5G743(MmZiZCutx(tNSy zv)jm-r&%Gd@`&-TlozZjnCdz% zJ5>^E9ypwANRWI{tobGotqUQodtmq#SdAXKuQM5SHKZ7xwHXTP35JN@1GBptp@2%K z{u?*ShK}pdp)1aYKZi>piG6x+c(Vr8?41{dCCn8 zb1-_m&`lM|g#pS9jqwin$Qa2ec(Z~e&z3j`E$bn|2BK-rBL>7P37{KlIH9vP=ov_Lt^(^J&5eydG8$WHs8nF3{~NOKS;sX`aXz}o~2 zOEgaB@m_)~iSI15^N<(Col=l5LE1xpibGn#dl}LN(^q~MYf{dv98|4(p~E*uJ77`3 zmg*o8l;<38cb-C^3UoEdaRkaCa|vH&&FkWcpi}A2pKT67TcjyGUp8|J(J+GiawzFJ zi_jV9l6bxZ*9e@)5oVq$oN)JX+&#)uXh{Us8fI`n^6TEt$D)X4z%l_?8 z$R>~8l<%9PRgbVh^eI%oNO|_9ef*XEVMjBqr=!|gIt?u8Kt=uTy`Tx_R;=2RfXxKRU+?DnosdY`# z4^h}`1^A1^qh_lzbWS#B@ZVn`N(K|GZDF}??}V*8)5UE0GiN7{Mi=?&UJ+ZPla+!ChzkL<|HC zFl0iBgd6HW~>C~ZvIEX_z#6gM_hYsQ(B3_Jx9Ukv}KYYLMn?Cid?|Uq- z#BGvByeIpsP~l(4*MOR@nXW{x%g=?{ISCFb&=c&!zfBou!D<`^b)@SZ=G4nO_tL;tf24C{kP^eJ$j8}9wbofa&;liBKMujZ7Il94hNu-BqM zdG!OWqmTG9W=c@|BdiTI2=skXp=LGS8QGSwGx8W#R$+7eh0o2kLr+FZS-zS-5~#bZ zg_fM+>kng|l3*bAhI)5|Ah@&gcf9PDn)>{>!tk68YryX!c>VdD7i8)9$a`)bA*r4##SC*?(EzMFCxb%w%rB0{Ia zcC}9`(V`ver43Q`ikD>GdW&}4p!gkiUen^;866-YmA%m+`Ymj?V!I3qlN7l9n6rHzIgxu delta 2461 zcmcgtTTGi}7=C~Hx8OJpN@36;$2!Di7RI4Wb|{EqHfTB2#RUx=6vn6pOK~s>ZecM? zrVIK;dZBZWm`r6EOFpy4XwVD2Gs{SJWfnYKm`#(#?859~AwJ*#w__}=@kY|L|KIO@ zzUO`3!}oq4+%TTKZM>Rd;Cl<%Pqa`QjZi=NSUG1ACPT4Oc8t6fph5Cc7lmk&{CIl- zpdhu-n|Ke>WcXKyV&=PxTdg51j8Qkt5;B4f0qqy7eA-|Z7GieE})~s0h++df%g+$xalZtG#xAj1};H*z`?SoklRMxtd?6iw&v|8(km{m_h zH-t<;j>OtEl+Gu`uk-2Fom5Q@usLXF6#Fdg=90=#;>tn?i?Q+?ZGG=rp zuPjvYF9#js`HZ^8DUm0%YwS1E}KC+s`*8&CqbA{0x-1&Ve&xbPjFL#b~FKz}0jGOOTOi%35 z8Z0^5(_(2VY?9f3WZ`Q?+&^>PxS`7HO{(&ZnUL6W?rN%0JMw&SD&JNd?HE_|LXy)) zj=)Dxj-B71+96$~Z(Qwor;z`iJKr3?XZkSfpIOQ#8MeKh=7cOJ$}l~)ulCUH7k zwl%XAullIf=99Q^sabh^kuO|&MyQ`V;u*f;yI*{kDd+hZj;&ui$Ud&RY%zK;tNQt( zAy3RLF29%Og0Ww_Yun-SgmzY{s6OIqP(CtP;#sT1uq{Sr_bSDP{CI#`444`X6y9}E z$&L7(N@r4BM|B%;C!be7Nh*rRSdUpQhn9mJlJ`#J!HdefiJ^5=kMUZk>x6_e|LXlt zWUgJAPKqCEB(p>LGkzXwbt$VJ<)_3_HmLsi6=nH9LifFj?8cR3*TYi1N{Sj6pw}mi M`bcwq2ocuK{eH;p(M?1O(mARdXLZKwlrQ^&z$4PLVmp_@AAhhoIR z8z#XSNwA1c5?b6yeoW6?6{wg7(qjhVqXGEKf_KdyO(@>^2IuaXTRoYi;K03v580>= z`)vsOuRHKNrg82?SgjLNw>0+5?W)Ls>F4RiD+==Ok{n((RaBN*_~*-<7d?({?L8+A zp@mCaTrVhf3d$SVdZD@RerSE}6uAzl!rRn4lTea`6xc-9mnvpiSi;-Li($WXSgWG;)zg zAJY5({7_b=X!WA?Xoey+Yv&0iYi-vvaujK#C|12k delta 2257 zcmcgtT}+#06n@_pirG(rHNZ+i3aBH>NMUW^0x#OSWeWX~pRmMDDWzk$uGF?{;EV)+ zmhEQFoh21zlaXcOOcuzCR)ZH?;)S}2&GhDW}nrX4zhkW$l~k;=Eu{|%&8Y;Gt%YiB(96SSGkOhz?0~ZlUA7#U^*8p^Oq%0oEMABTlf%L6h-z zRJ-AlEZ5V8!Bkpf`17*?n!9NrU9ePWUW{l*L)a>2Qct>nfiKfWZM%zzQuRI z@hIC^u%9)8OauMh>!70HJki?Mx0kF_6}6eZNTgO~S6D-vVC_`8;%6sm+-o@S_&> z#{|=Img19~Awlww8_DvCPiWq))9lP9?wvMKDpf(|Yk71j_9U%++)mf-m}&B?na+>x z6>IPRr7>-p7lU&wJT1yEOc#-Ts=OfGYB4wQrzYD#a}zdNn!NHa+r_KrWV;?8^iF-l z>AO#_Y%(Tvn+ywFd^B@0e*=}}RHZ^A@>yKmx;?uyUy&Hhg5nr&;PTVK}8HoJ1SBY^#t+E#_-hrUm48blB73HkehYgkk- zG#UyI<5j&rlr0l&i!Q#|NNtPH(aO?gid@a3rJqXa)um9b7_qX{#0%wp6@ywsihhIC zm@3Kd#sc=!U2T~#r+ztC;)Szc`MvR={24_ew&dy&KB~>>Yf8ZPN78eQ&uEM}4`ZvW z$<^1mL0gu~Z)es7ymym#0(@Fil`Etfmyuk}7S^IxJ2b#AZ5?W7&FlcPCzl6#;Wjk^ zJ7KTkdlJ3J_%q41Q{1W9j$z$<+{2TRC?DZDc{H+S72N$eKfN`$G>_zOZ}I`2yfK2R n|HWCxF6ZvPMV9;`d1Q<~$Q_U#55Rx5Ej!H5!xKdp_=$f28x=Ro diff --git a/PROMS/Formats/fmtall/wst2all.xml b/PROMS/Formats/fmtall/wst2all.xml index 72ab28d6b89369aca51a6868a9d212e2efefcbce..6ab56c916e7d415615c17ef17dc6a7284836f084 100644 GIT binary patch delta 293 zcmZ2?hV{*1)(tJplQ*!iY~IDJ!MHhs^_#)wBC~r;lWit)aXK;BGAJ>eS5=sN(NcEv z5z7;dn^#!NF>Nlg>k^tA(ZM&_p_6Cwf!?sm3YC156GC|=Ux;9vY*4@j77GaVn|xs% z$L6@8O=6Sx)ksZ#FpX_zCd*Cbn*6OI%1qnPRGv}PSXJ(r349_+V z&+qA|d(~_TLlmYU4+R(o2fLvQl3qKUf(gh#35u9bKow@;8b%`stUwrUVO)XP`ln&i z*_XudCMFzUhZq8?7*9hIBM#^POYJN@@9SZ&^G`R4iK9hWDe;#Wl(> zhTj?fHt>K14tiIzT2n~KU@d{)>)0=Z9mD8h5~}otpj5T7 z9cpT|A9W;Dlb|153idbzz(k`fCiZw}(QLBAIf&r+GLVI7DlXgT`a+hbQwL}{y`Qcp zjr7a-Ub?h&fu_?jmK}Z7ZBy4$Xqn_I;=Q8>O5jVuJorv9)N-2);F;LV-DJ$X3zl6>?uX$S|kze%gRy%`|g^4u9R zBJ^k@z2L)x+KGP8jA?57wucCg&t`O}=Btw^_{o9^+;K$7hV2 z7dZ#;Pflrfo2+NYHo0Mn%H#=Qe3KiBcqShxV4Hj(fot-GiD8oqiUKzKg`5$aJRx0b za^76F%~9DA+LPs`OHFo|eqwS=n9}Bg8CC+D53H~Pnz|}SbMv&zEzFzEu3Ioqo_2ZJ h}t9F@ZRnTkb7`Fupvj0Wp*|uX!?w2>{7aQl|g_ delta 951 zcma)4Jxo(k6h7~@F%F^@0~MOmh6Nf4DgMwVrVpM7F$PO$AuOh$v@cS{Rvw_3)VMks z;gmrJA`1*Iz;$*q$RdLwG0_BnRu)(d1K)kGjRoFdn%v&^o$q|#Irp5`pIslfU2FSl zpqH|gqiMQLX`E>aQZL=30#Jiu)Xe&qOJZNGRg56@&^QQrdVo+82NH!$^k7TnzT*DtE0<@NRQJ1nk%3k zS#DVT?AlX!NjvxQ^yApHBy=-yF!0MmTgu4P2({Byt4}*#iP;uIV9%mk%fw>YYKdcN zcC-yT(KC>XQX5YWHi#`faiJzi{d5;Em!>hA;uo{SVsvoR>$gW>lzWilkRr0YES_V% z=oj6&)D;eE?yd>6YER0f*Ph5HFP)YmTG8=luM=w4yr~lEGHU zy^-^mqs-8w6Qzz|v*Z#Qyu8@LABv6qZt<-6v~c;N=MK8aVdcgv567O>(8fx=aylYB ztCOL+0gN$gZC4zr<-HKf&WysZ{`3p&>z3km;&f01teC68DHx$^)XB=udrs}vi@)DY hHQ-FUL7muwYI5t3H~&QzsokRLTs@3i#Nn@b^$1~p*rosg diff --git a/PROMS/Formats/fmtall/wstbckall.xml b/PROMS/Formats/fmtall/wstbckall.xml index 78648e74e72192b509018978056009f0c7f8eaf4..6e3b5519a610eae5c38109fd407eb9d6e7868b59 100644 GIT binary patch delta 363 zcmY+4JxBs!9EW+&w?huOj;QNU5EBch!|^b@4l#2IYp`f(Xmf}gN~lR1qO^|kFIpra z4Z8JlFL4q18ALcVnMh-EL_}jlm$kV3c=$a}>KVV?|O8FfplHoz)@}dKI4ciD}sb6tte2t>{e{?!fv4^_UZmI?dZnLv)H_l%fR85z5gwl*H)(95WQ8 zvp8p9i{N__w^OjEI5yyPg>cHjnx!aC;xE5bmX)6`yUkM{KJxI3ea#JPu*l0T{qyb- z1m=*o3>!pX9P9)x3wweeTyNo%qpjw{e!tct8PYU{&##0!^^qSyZw4YA6JQs^T?C(} z5w0UV2&gH_@vgxsZrJ@U26IF~rRQEenPQG+JM; zRfV)i?xUzUO$PsDbh#^4*~qJ-siZWGBB#`!Szw>-0qRdXJq}dE| z$HCO%5CY@V;4D>(I3emqEz+CyF+=F)9OBB8xN+>~)WCl&)N}fvgBJqtoo?ELKglVR zqb8fr+;X0`ni7F+QmJTwrPVayvX?%lPZbyIzID3|LB8~xaN}KvWuaythQkE(LVFHDSdOj46QUgMl<|J z!O7od9ej77lNWzT@rmhf^LpA>=dxb2Q5rg#5W$eJINs6ad)v)-*@bPDSvfZEHSd1E zYO69nt@`cdX#N7*^PT_FeV!k&RT&;@=Ci_U`+Dm!E^OMeA|#reRR9o^5GF z%yYj6wHoG?qF%$yE5#Ll_;|5F)-r;nWswUA6r7k{6gh%(q`~ o-xdq4T47^XAD-4{hKfW)G&D6tg!Gn% z2#3Z7@v~?MksxSvXclR342NiH$RfgMeeeC=<6S>;uQyy_ghz$v5%o#P@`uYpaG@z zVe-dJ47IQom0c_4eXnM$Y=|g$?DR6xWH_3U(2VaRqwJs>DxolS_D@rSN9`I_L+T%p z0%|YAm03dG?f4pnKW0UBTtF_mK-t+cLveYmW#~|rMC8U@6b)Or_D%%U5~=ei>>Ia7 zyl4!%e$%yx(D8HToI~C#K^jsZ%0Xx`3od;_s88}#UtKUlog2VYyn;nXKQ$A#JSEb5 k4Dyy8S~5e=$s$7{ogyJM&05yW2 delta 1534 zcmb7E-%rv}6hB`TLvW=Sxrr!XE=?kECRlT+46#fx!F*Ag0+I>{NM*e^U2d(_Rvp*Y zqxI%`u-(djY%bSot=gLY2W>r;(-$9I=YGFp3bff6_xt^R?m3_HIp>~x)?Q{k`5CY(a1l)iSy|t2E92{_s-s6P1>FJ~0 zVZtN$Kv|?6qptvrgNG1q&A%h!N+?csY4Kamw0<{x3&n}=iqQxLu;4k_jJ|`I611C) z;vgnJY32Omga4xFeCY_#g26RtuS2FW!JE*OF~ zk{qNIFA&0$35fy%I zK|6`sPN730g_%t%Dg<>8c}OMX>>eswlnT9~FUJXMezoMpm9|oZkZ8;Gx+v99|y(BKF@{r{OMfz(cF?H`@l6H+yOO-a!--vToHQsmRvd{T-YMi!~9!M5! zuJRt6Fr3cb4YIk)DOtJHSAp&7@gC!}J}Ln3K?Bp**t3siHVTsoZ_+R zH=OE+nzD+0NXE;iW_<58Fr9r<)K{3oMQqFNhJ8|n<>1#9ZLDWJ)8WM7&5h?b+tA;&IH z0Y+;EaV>h7HT6!&WMT{Aa-XI`YDU-gEQ-^WqzRV1oKn-`q_vu7v(teqeP8XF^WW(; zx_o>h`Cv4q8+&P7(6y%+2GnRO*;4To4;*0Gtl+;*Z1RR8 zsm%gua@v#2CaO$6Hu1pZ9|206-%VO2w0Yf9E5^kiiU*o414%}d)+h+_B8a-Ezd*W+G-4OwMIiQl-gknQvGKyg`<(NAKIdm{MgMb6Kl5A1 zcl*i>Zt9{0g(ytN$fA7H2~lsN4vJ8a;&d5iKc#4dV)#1+VUpZ*9sfxh$t+BZ3cl2` z+n9hPOvBUzffUJmTs>js(H5ift7OS;-bif+Ke>U8;MB;*w^d56>7(wfBweF!oHt}% z)I=_vChAl(jf3B=+CSHsRC@rhAYS-!UPUf#$i@xrAfP~SvuDppl#wC+tb z&1(b41)7U&WLLEZ={OnK@O>wL>D4O}t-dmYiO$g(v^7ZmXk@3WhJC%exNq3TW31=u zRtt{>%h>KKK#k%iaBYv)4y4zRCz zn~1SFy}wq=+?yYE5}lMglJBWjAy=fW=78!+VPXEG<;L`sHva~jt{>}F)W)x0`oRen6G6#u%E)v1fQylafr%d`hm_FKBD2(M5(Tp+ xahO7rl(!NEc#aV=@+s#8h!nlj20PkV4aBoLJ3R;=~V>QbiCK zuC7qsxN#+dL|zfaE(=n+>7sw4OP2)~p7&;gSfyR$<;}V0-E;28(I4;ERbOr18yKV_ zO_5D6DUUNxAsVC+ngwd`@uZ(^@2L@@6qOLO$RvYw@Rn!>w;}K<;Lqb;0jA@>fanx( zi(XKevcRiA!^oQkYU4f!bXL8U-&P&vuD*7m`L?6H7Hes~5s_)4;vyzIe);YLjpAHT z*<++pm>1%DAP1d1Vmi(;G?GwpE90~H=V*w=fEcK(3g^<{EBq`Vw>@W7FHjpN6I%~P zkZloqY044)I&T)fzpKRO++=s6e$NfRxOYeyFw^xk~io%;_;E6-dxMQxU;*5HG-Qt(cr~Ju$+*EJ+ zuK6SNPch|s0I~&|{>x4dO_D2#wGsJJqM!tmuurx>lR_}cCZC+Hc)K{*ummo;zjeo8OJD2~O`#O29^?|&p@ K`z<2pA3fJm?#L_v diff --git a/PROMS/Formats/fmtall/wstsamall.xml b/PROMS/Formats/fmtall/wstsamall.xml index 9cfbf9134ef1ef9d00cb44549a61197f74b10c0b..73202e14cd46f9d9255aa7e7c98c4235f5177963 100644 GIT binary patch delta 288 zcmbPtg7wyZ)(x9jHa}s}Vcgut_QPQMHY-Mf&0EaRFiqx}z{TmrV9TJya9&kmGNZNZ z<}X$!7&qUrkz?At$i7Qx@)ir9NmEoN3v}{Lo)E?}DT;0Khi;YN)h?0o0TTe*9dE$^ delta 1130 zcmb7CO=uHg5S=e3CuyMFHbG-aY!9I{+D(l4sRoic##Sn3jx!1870&6}Aw@AC)C%a-L` z!_1Slo~{_3p+(A3o+32BKLsSEVfHY$izcW*87k5oQYk9aGF`#z1i&SV(M`Ndv|PD< zoJqrJJZ~T{KrV^{P{w@V$zrQM8R=nRzO6@0!Gag>A~WaEsZa2rhsk zP6;fwh*boUtkjMSns%2}hCF3ab*?5&Xn+)0v*6F;R|K;l5Jf>cNIrE{E#J;* zkN%!JfQjP#{&^o?zhH|R50r&Lgk6LO#5uEcdB@08Fcc0$dG4&b71#4#se2Mz%)?;? zgtdc=)Q_=$!+fMZq&#~quk^C zhS?XBA(2ldYJ$jW*>A+*CohHJze5n!uYs-OVB2E^4gwa?T0V`j8I#i(beID0R2y2E zjWAoYKFJ>Z4}R+udt>UfwXRM&!5(#5UDL3dWFI?fsI&D>voW)wka81BKiu^P$O8dI diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs index 0cb038ff..59b4cfe1 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs @@ -49,10 +49,8 @@ namespace VEPROMS this.imageCodecInfoBindingSource = new System.Windows.Forms.BindingSource(this.components); this.ppLblGrphFileExtDefault = new System.Windows.Forms.Label(); this.lblGrphFileExt = new System.Windows.Forms.Label(); - this.ppBtnDeftDisAutoDuplx = new DevComponents.DotNetBar.ButtonX(); this.ppBtnDefWatermark = new DevComponents.DotNetBar.ButtonX(); this.ppCmbxWatermark = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.ppLblAutoDuplexDefault = new System.Windows.Forms.Label(); this.ppLblWatermarkDefault = new System.Windows.Forms.Label(); this.ppNumUpDwnOvrdPrnPenWidth = new System.Windows.Forms.NumericUpDown(); this.label9 = new System.Windows.Forms.Label(); @@ -62,7 +60,6 @@ namespace VEPROMS this.label11 = new System.Windows.Forms.Label(); this.ppNumUpDwnAdjPrnStartPos = new System.Windows.Forms.NumericUpDown(); this.label12 = new System.Windows.Forms.Label(); - this.ppChbxDisAutoDuplex = new System.Windows.Forms.CheckBox(); this.label29 = new System.Windows.Forms.Label(); this.ppChkbxStMsgActive = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.ppRTxtStMsg = new System.Windows.Forms.RichTextBox(); @@ -434,20 +431,6 @@ namespace VEPROMS this.lblGrphFileExt.TabIndex = 19; this.lblGrphFileExt.Text = "Graphic File Extension"; // - // ppBtnDeftDisAutoDuplx - // - this.ppBtnDeftDisAutoDuplx.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDeftDisAutoDuplx.Location = new System.Drawing.Point(595, 22); - this.ppBtnDeftDisAutoDuplx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppBtnDeftDisAutoDuplx.Name = "ppBtnDeftDisAutoDuplx"; - this.ppBtnDeftDisAutoDuplx.Size = new System.Drawing.Size(59, 25); - this.superTooltip1.SetSuperTooltip(this.ppBtnDeftDisAutoDuplx, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDeftDisAutoDuplx.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(255, 150))); - this.ppBtnDeftDisAutoDuplx.TabIndex = 33; - this.ppBtnDeftDisAutoDuplx.Text = "Default"; - this.ppBtnDeftDisAutoDuplx.ThemeAware = true; - this.ppBtnDeftDisAutoDuplx.Visible = false; - this.ppBtnDeftDisAutoDuplx.Click += new System.EventHandler(this.ppBtnDeftDisAutoDuplx_Click); - // // ppBtnDefWatermark // this.ppBtnDefWatermark.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; @@ -480,20 +463,6 @@ namespace VEPROMS this.ppCmbxWatermark.WatermarkText = "select watermark option"; this.ppCmbxWatermark.SelectedValueChanged += new System.EventHandler(this.ppCmbxWatermark_SelectedValueChanged); // - // ppLblAutoDuplexDefault - // - this.ppLblAutoDuplexDefault.AutoSize = true; - this.ppLblAutoDuplexDefault.BackColor = System.Drawing.Color.Transparent; - this.ppLblAutoDuplexDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppLblAutoDuplexDefault.ForeColor = System.Drawing.Color.Gray; - this.ppLblAutoDuplexDefault.Location = new System.Drawing.Point(400, 46); - this.ppLblAutoDuplexDefault.Name = "ppLblAutoDuplexDefault"; - this.ppLblAutoDuplexDefault.Size = new System.Drawing.Size(64, 13); - this.superTooltip1.SetSuperTooltip(this.ppLblAutoDuplexDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the Automatic Duplex default setting", "", "Pressing the Default Button (to the right)\r\nwill reset the Automatic Duplex setti" + - "ng back\r\nto this default.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.ppLblAutoDuplexDefault.TabIndex = 51; - this.ppLblAutoDuplexDefault.Text = "(default ON)"; - // // ppLblWatermarkDefault // this.ppLblWatermarkDefault.AutoSize = true; @@ -594,22 +563,6 @@ namespace VEPROMS this.label12.TabIndex = 6; this.label12.Text = "Adjust Starting Position on Page (dots)"; // - // ppChbxDisAutoDuplex - // - this.ppChbxDisAutoDuplex.AutoSize = true; - this.ppChbxDisAutoDuplex.BackColor = System.Drawing.Color.Transparent; - this.ppChbxDisAutoDuplex.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.folderConfigBindingSource, "Print_DisableDuplex", true)); - this.ppChbxDisAutoDuplex.Location = new System.Drawing.Point(380, 22); - this.ppChbxDisAutoDuplex.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppChbxDisAutoDuplex.Name = "ppChbxDisAutoDuplex"; - this.ppChbxDisAutoDuplex.Size = new System.Drawing.Size(199, 20); - this.superTooltip1.SetSuperTooltip(this.ppChbxDisAutoDuplex, new DevComponents.DotNetBar.SuperTooltipInfo("Disable Automatic Duplex", "", "Checking this box will turn OFF the automatic duplexing used in some formats for " + - "Foldout pages.", null, null, DevComponents.DotNetBar.eTooltipColor.System, true, false, new System.Drawing.Size(0, 0))); - this.ppChbxDisAutoDuplex.TabIndex = 32; - this.ppChbxDisAutoDuplex.Text = "Disable Automatic Duplexing"; - this.ppChbxDisAutoDuplex.UseVisualStyleBackColor = false; - this.ppChbxDisAutoDuplex.CheckedChanged += new System.EventHandler(this.ppChbxDisAutoDuplex_CheckedChanged); - // // label29 // this.label29.AutoSize = true; @@ -2277,10 +2230,7 @@ namespace VEPROMS // this.tcpOutputSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.tcpOutputSettings.Controls.Add(this.groupPanel2); - this.tcpOutputSettings.Controls.Add(this.ppBtnDeftDisAutoDuplx); - this.tcpOutputSettings.Controls.Add(this.ppLblAutoDuplexDefault); this.tcpOutputSettings.Controls.Add(this.ppBtnDefWatermark); - this.tcpOutputSettings.Controls.Add(this.ppChbxDisAutoDuplex); this.tcpOutputSettings.Controls.Add(this.label29); this.tcpOutputSettings.Controls.Add(this.ppCmbxWatermark); this.tcpOutputSettings.Controls.Add(this.ppLblWatermarkDefault); @@ -2597,7 +2547,6 @@ namespace VEPROMS private System.Windows.Forms.Label label27; private System.Windows.Forms.Label label30; private System.Windows.Forms.Label label31; - private System.Windows.Forms.CheckBox ppChbxDisAutoDuplex; private System.Windows.Forms.Label label29; private System.Windows.Forms.BindingSource folderConfigBindingSource; private System.Windows.Forms.Label lblGrphFileExt; @@ -2610,7 +2559,6 @@ namespace VEPROMS private System.Windows.Forms.Label ppLblChgBarUserMsgTwoDefault; private System.Windows.Forms.Label ppLblChgBarUserMsgOneDefault; private System.Windows.Forms.Label ppLblWatermarkDefault; - private System.Windows.Forms.Label ppLblAutoDuplexDefault; private System.Windows.Forms.Label ppLblStpEditorColsDefault; private DevComponents.DotNetBar.SuperTooltip superTooltip1; private DevComponents.DotNetBar.Controls.ComboBoxEx ppCmbxFormat; @@ -2630,7 +2578,6 @@ namespace VEPROMS private DevComponents.DotNetBar.ButtonX ppBtnDefCbTxt2; private DevComponents.DotNetBar.Controls.CheckBoxX ppCbShwDefSettings; private DevComponents.DotNetBar.ButtonX ppBtnDefEdCols; - private DevComponents.DotNetBar.ButtonX ppBtnDeftDisAutoDuplx; private System.Windows.Forms.FolderBrowserDialog dlgROFolder; private DevComponents.DotNetBar.ButtonX ppBtnChgTextColors; private DevComponents.DotNetBar.ColorPickerDropDown ppColorPickerViewModebckgnd; diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.cs index 7c55c5dc..e0d3a6e7 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.cs @@ -116,9 +116,6 @@ namespace VEPROMS _DefaultWatermark = _FolderConfig.Print_Watermark.ToString(); SetupDefault(EnumDescConverter.GetEnumDescription(_FolderConfig.Print_Watermark), ppLblWatermarkDefault, ppCmbxWatermark); - // Get the default Disable Duplex - _DefaultDisableDuplex = _FolderConfig.Print_DisableDuplex; - ppLblAutoDuplexDefault.Text = string.Format("(Duplex {0})", (_DefaultDisableDuplex) ? "OFF" : "ON"); // Get the default Format Columns _DefaultFormatColumns = _FolderConfig.Format_Columns.ToString(); @@ -305,24 +302,6 @@ namespace VEPROMS ppLblGrphFileExtDefault.Visible = false; this.lblGrphFileExt.Visible = false; - // Set the auto duplex controls based on whether the format allows this: - // Note that the controls' visibility would not set correctly using the following two lines of code. That - // is why the more explicit logic was done. - //ppChbxDisAutoDuplex.Visible = _DocVersionConfig.MyDocVersion.MyFormat.PlantFormat.FormatData.PrintData.AllowDuplex; - //ppLblAutoDuplexDefault.Visible = ppBtnDeftDisAutoDuplx.Visible = ppLblAutoDuplexDefault.Visible; - FolderInfo fi = FolderInfo.Get(_FolderConfig.MyFolder.FolderID); - if (fi.ActiveFormat.PlantFormat.FormatData.PrintData.AllowDuplex) - { - ppChbxDisAutoDuplex.Visible = true; - ppLblAutoDuplexDefault.Visible = true; - ppBtnDeftDisAutoDuplx.Visible = true; - } - else - { - ppChbxDisAutoDuplex.Visible = false; - ppLblAutoDuplexDefault.Visible = false; - ppBtnDeftDisAutoDuplx.Visible = false; - } // HIDE the text box that allows the user to change the Procedure Panel's heading (title) on the panel bar ppRTxtHeading.Visible = false; lblHeading.Visible = false; @@ -664,20 +643,6 @@ namespace VEPROMS //tcpOutputSettings.Focus(); } - /// - /// Checkbox of the Disable Automatic Duplex changed. - /// - /// object - /// EventArgs - private void ppChbxDisAutoDuplex_CheckedChanged(object sender, EventArgs e) - { - if (!_Initializing) - { - _FolderConfig.Print_DisableDuplex = ppChbxDisAutoDuplex.Checked; - ppBtnDeftDisAutoDuplx.Visible = (!_FolderConfig.Name.Equals("VEPROMS")) && (_DefaultDisableDuplex != ppChbxDisAutoDuplex.Checked); - ppLblAutoDuplexDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDeftDisAutoDuplx.Visible; - } - } #endregion @@ -1174,7 +1139,6 @@ namespace VEPROMS ppLblChgBarUserMsgOneDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefCbTxt1.Visible; ppLblChgBarUserMsgTwoDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefCbTxt2.Visible; - ppLblAutoDuplexDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDeftDisAutoDuplx.Visible; ppLblStpEditorColsDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefEdCols.Visible; ppLblGrphFileExtDefault.Visible = (ppCbShwDefSettings.Checked || _IsVepromsNode) && ppBtnDefaultGrphFileExt.Visible; ppLblWatermarkDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefWatermark.Visible; @@ -1300,15 +1264,6 @@ namespace VEPROMS } } - private void ppBtnDeftDisAutoDuplx_Click(object sender, EventArgs e) - { - ppChbxDisAutoDuplex.Checked = _DefaultDisableDuplex; - _FolderConfig.Print_DisableDuplex = ppChbxDisAutoDuplex.Checked; - ppBtnDeftDisAutoDuplx.Visible = false; - ppLblAutoDuplexDefault.Visible = false; - //tcpOutputSettings.Focus(); - } - private void frmFolderProperties_Shown(object sender, EventArgs e) { ppRTxtName.Focus(); diff --git a/PROMS/VEPROMS User Interface/frmProcedureProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmProcedureProperties.Designer.cs index 2a826d34..cee5af17 100644 --- a/PROMS/VEPROMS User Interface/frmProcedureProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmProcedureProperties.Designer.cs @@ -74,9 +74,6 @@ namespace VEPROMS this.label41 = new System.Windows.Forms.Label(); this.ppNumUpDwnAdjPrnStartPos = new System.Windows.Forms.NumericUpDown(); this.label42 = new System.Windows.Forms.Label(); - this.ppBtnDeftDisAutoDuplx = new DevComponents.DotNetBar.ButtonX(); - this.ppLblAutoDuplexDefault = new System.Windows.Forms.Label(); - this.ppChbxDisAutoDuplex = new System.Windows.Forms.CheckBox(); this.ppBtnDefWatermark = new DevComponents.DotNetBar.ButtonX(); this.ppCmbxWatermark = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.ppLblWatermarkDefault = new System.Windows.Forms.Label(); @@ -712,52 +709,6 @@ namespace VEPROMS this.label42.TabIndex = 6; this.label42.Text = "Adjust Starting Position on Page (dots)"; // - // ppBtnDeftDisAutoDuplx - // - this.ppBtnDeftDisAutoDuplx.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDeftDisAutoDuplx.Location = new System.Drawing.Point(592, 30); - this.ppBtnDeftDisAutoDuplx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppBtnDeftDisAutoDuplx.Name = "ppBtnDeftDisAutoDuplx"; - this.ppBtnDeftDisAutoDuplx.Size = new System.Drawing.Size(59, 25); - this.superTooltip1.SetSuperTooltip(this.ppBtnDeftDisAutoDuplx, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDeftDisAutoDuplx.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(255, 150))); - this.ppBtnDeftDisAutoDuplx.TabIndex = 63; - this.ppBtnDeftDisAutoDuplx.TabStop = false; - this.ppBtnDeftDisAutoDuplx.Text = "Default"; - this.ppBtnDeftDisAutoDuplx.ThemeAware = true; - this.ppBtnDeftDisAutoDuplx.Visible = false; - this.ppBtnDeftDisAutoDuplx.Click += new System.EventHandler(this.ppBtnDeftDisAutoDuplx_Click); - // - // ppLblAutoDuplexDefault - // - this.ppLblAutoDuplexDefault.AutoSize = true; - this.ppLblAutoDuplexDefault.BackColor = System.Drawing.Color.Transparent; - this.ppLblAutoDuplexDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppLblAutoDuplexDefault.ForeColor = System.Drawing.Color.Gray; - this.ppLblAutoDuplexDefault.Location = new System.Drawing.Point(397, 54); - this.ppLblAutoDuplexDefault.Name = "ppLblAutoDuplexDefault"; - this.ppLblAutoDuplexDefault.Size = new System.Drawing.Size(86, 17); - this.superTooltip1.SetSuperTooltip(this.ppLblAutoDuplexDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the Automatic Duplex default setting", "", "Pressing the Default Button (to the right)\r\nwill reset the Automatic Duplex setti" + - "ng back\r\nto this default.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(0, 0))); - this.ppLblAutoDuplexDefault.TabIndex = 62; - this.ppLblAutoDuplexDefault.Text = "(default ON)"; - // - // ppChbxDisAutoDuplex - // - this.ppChbxDisAutoDuplex.AutoSize = true; - this.ppChbxDisAutoDuplex.BackColor = System.Drawing.Color.Transparent; - this.ppChbxDisAutoDuplex.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.procedureConfigBindingSource, "Print_DisableDuplex", true)); - this.ppChbxDisAutoDuplex.Location = new System.Drawing.Point(377, 30); - this.ppChbxDisAutoDuplex.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppChbxDisAutoDuplex.Name = "ppChbxDisAutoDuplex"; - this.ppChbxDisAutoDuplex.Size = new System.Drawing.Size(209, 21); - this.superTooltip1.SetSuperTooltip(this.ppChbxDisAutoDuplex, new DevComponents.DotNetBar.SuperTooltipInfo("Disable Automatic Duplex", "", "Checking this box will turn OFF the automatic duplexing used in some formats for " + - "Foldout pages.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(0, 0))); - this.ppChbxDisAutoDuplex.TabIndex = 61; - this.ppChbxDisAutoDuplex.TabStop = false; - this.ppChbxDisAutoDuplex.Text = "Disable Automatic Duplexing"; - this.ppChbxDisAutoDuplex.UseVisualStyleBackColor = false; - this.ppChbxDisAutoDuplex.CheckedChanged += new System.EventHandler(this.ppChbxDisAutoDuplex_CheckedChanged); - // // ppBtnDefWatermark // this.ppBtnDefWatermark.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; @@ -1709,10 +1660,7 @@ namespace VEPROMS // tcpOutputSettings // this.tcpOutputSettings.Controls.Add(this.ppGrpbxPrnAdj); - this.tcpOutputSettings.Controls.Add(this.ppBtnDeftDisAutoDuplx); this.tcpOutputSettings.Controls.Add(this.label18); - this.tcpOutputSettings.Controls.Add(this.ppLblAutoDuplexDefault); - this.tcpOutputSettings.Controls.Add(this.ppChbxDisAutoDuplex); this.tcpOutputSettings.Controls.Add(this.ppLblWatermarkDefault); this.tcpOutputSettings.Controls.Add(this.ppBtnDefWatermark); this.tcpOutputSettings.Controls.Add(this.ppCmbxWatermark); @@ -2056,9 +2004,6 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.ComboBoxEx ppCmbxWatermark; private System.Windows.Forms.Label ppLblWatermarkDefault; private System.Windows.Forms.Label label18; - private DevComponents.DotNetBar.ButtonX ppBtnDeftDisAutoDuplx; - private System.Windows.Forms.Label ppLblAutoDuplexDefault; - private System.Windows.Forms.CheckBox ppChbxDisAutoDuplex; private System.Windows.Forms.NumericUpDown ppNumUpDwnOvrdPrnPenWidth; private System.Windows.Forms.Label label39; private System.Windows.Forms.Label label40; diff --git a/PROMS/VEPROMS User Interface/frmProcedureProperties.cs b/PROMS/VEPROMS User Interface/frmProcedureProperties.cs index 4f90856c..19d5958d 100644 --- a/PROMS/VEPROMS User Interface/frmProcedureProperties.cs +++ b/PROMS/VEPROMS User Interface/frmProcedureProperties.cs @@ -168,9 +168,6 @@ namespace VEPROMS _DefaultFormatColumns = _ProcedureConfig.Format_Columns.ToString(); SetupDefault(EnumDescConverter.GetEnumDescription(_ProcedureConfig.Format_Columns), ppLblStpEditorColsDefault, ppCmbxStpEditorCols); - // Get the default Disable Duplex - _DefaultDisableDuplex = _ProcedureConfig.Print_DisableDuplex; - ppLblAutoDuplexDefault.Text = string.Format("(Duplex {0})", (_DefaultDisableDuplex) ? "OFF" : "ON"); _ProcedureConfig.ParentLookup = false; @@ -581,7 +578,6 @@ namespace VEPROMS ppLblChgBarTxtTypeDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefCbTxtTyp.Visible; ppLblChgBarUserMsgOneDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefCbTxt1.Visible; ppLblChgBarUserMsgTwoDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefCbTxt2.Visible; - ppLblAutoDuplexDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDeftDisAutoDuplx.Visible; } /// @@ -741,14 +737,6 @@ namespace VEPROMS //tcpOutputSettings.Focus(); } - private void ppBtnDeftDisAutoDuplx_Click(object sender, EventArgs e) - { - ppChbxDisAutoDuplex.Checked = _DefaultDisableDuplex; - _ProcedureConfig.Print_DisableDuplex = ppChbxDisAutoDuplex.Checked; - ppBtnDeftDisAutoDuplx.Visible = false; - ppLblAutoDuplexDefault.Visible = false; - //tcpOutputSettings.Focus(); - } private void ppTxbxChangeBarUserMsgOne_TextChanged(object sender, EventArgs e) { @@ -764,17 +752,6 @@ namespace VEPROMS //tcpOutputSettings.Focus(); } - private void ppChbxDisAutoDuplex_CheckedChanged(object sender, EventArgs e) - { - - if (!_Initializing) - { - _ProcedureConfig.Print_DisableDuplex = ppChbxDisAutoDuplex.Checked; - ppBtnDeftDisAutoDuplx.Visible = _DefaultDisableDuplex != ppChbxDisAutoDuplex.Checked; - ppLblAutoDuplexDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDeftDisAutoDuplx.Visible; - //tcpOutputSettings.Focus(); - } - } private void frmProcedureProperties_Shown(object sender, EventArgs e) { diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs index cf799479..2d7606d6 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs @@ -76,14 +76,11 @@ namespace VEPROMS this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.ppBtnPDFLoc = new DevComponents.DotNetBar.ButtonX(); - this.ppBtnDeftDisAutoDuplx = new DevComponents.DotNetBar.ButtonX(); this.ppBtnDefWatermark = new DevComponents.DotNetBar.ButtonX(); this.ppCmbxWatermark = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.ppLblWatermarkDefault = new System.Windows.Forms.Label(); this.ppTxtBxPDFLoc = new System.Windows.Forms.TextBox(); this.label18 = new System.Windows.Forms.Label(); - this.ppLblAutoDuplexDefault = new System.Windows.Forms.Label(); - this.ppChbxDisAutoDuplex = new System.Windows.Forms.CheckBox(); this.label17 = new System.Windows.Forms.Label(); this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); this.ppCbShwDefSettings = new DevComponents.DotNetBar.Controls.CheckBoxX(); @@ -806,19 +803,6 @@ namespace VEPROMS this.ppBtnPDFLoc.TabIndex = 31; this.ppBtnPDFLoc.Click += new System.EventHandler(this.ppBtnPDFLoc_Click); // - // ppBtnDeftDisAutoDuplx - // - this.ppBtnDeftDisAutoDuplx.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDeftDisAutoDuplx.Location = new System.Drawing.Point(434, 60); - this.ppBtnDeftDisAutoDuplx.Margin = new System.Windows.Forms.Padding(2); - this.ppBtnDeftDisAutoDuplx.Name = "ppBtnDeftDisAutoDuplx"; - this.ppBtnDeftDisAutoDuplx.Size = new System.Drawing.Size(44, 20); - this.superTooltip1.SetSuperTooltip(this.ppBtnDeftDisAutoDuplx, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDeftDisAutoDuplx.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(255, 150))); - this.ppBtnDeftDisAutoDuplx.TabIndex = 35; - this.ppBtnDeftDisAutoDuplx.Text = "Default"; - this.ppBtnDeftDisAutoDuplx.ThemeAware = true; - this.ppBtnDeftDisAutoDuplx.Click += new System.EventHandler(this.ppBtnDeftDisAutoDuplx_Click); - // // ppBtnDefWatermark // this.ppBtnDefWatermark.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; @@ -887,37 +871,6 @@ namespace VEPROMS this.label18.TabIndex = 54; this.label18.Text = "PDF Location"; // - // ppLblAutoDuplexDefault - // - this.ppLblAutoDuplexDefault.AutoSize = true; - this.ppLblAutoDuplexDefault.BackColor = System.Drawing.Color.Transparent; - this.ppLblAutoDuplexDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppLblAutoDuplexDefault.ForeColor = System.Drawing.Color.Gray; - this.ppLblAutoDuplexDefault.Location = new System.Drawing.Point(286, 80); - this.ppLblAutoDuplexDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.ppLblAutoDuplexDefault.Name = "ppLblAutoDuplexDefault"; - this.ppLblAutoDuplexDefault.Size = new System.Drawing.Size(64, 13); - this.superTooltip1.SetSuperTooltip(this.ppLblAutoDuplexDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the Automatic Duplex default setting", "", "Pressing the Default Button (to the right)\r\nwill reset the Automatic Duplex setti" + - "ng back\r\nto this default.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(0, 0))); - this.ppLblAutoDuplexDefault.TabIndex = 53; - this.ppLblAutoDuplexDefault.Text = "(default ON)"; - // - // ppChbxDisAutoDuplex - // - this.ppChbxDisAutoDuplex.AutoSize = true; - this.ppChbxDisAutoDuplex.BackColor = System.Drawing.Color.Transparent; - this.ppChbxDisAutoDuplex.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_DisableDuplex", true)); - this.ppChbxDisAutoDuplex.Location = new System.Drawing.Point(272, 60); - this.ppChbxDisAutoDuplex.Margin = new System.Windows.Forms.Padding(2); - this.ppChbxDisAutoDuplex.Name = "ppChbxDisAutoDuplex"; - this.ppChbxDisAutoDuplex.Size = new System.Drawing.Size(161, 17); - this.superTooltip1.SetSuperTooltip(this.ppChbxDisAutoDuplex, new DevComponents.DotNetBar.SuperTooltipInfo("Disable Automatic Duplex", "", "Checking this box will turn OFF the automatic duplexing used in some formats for " + - "Foldout pages.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(0, 0))); - this.ppChbxDisAutoDuplex.TabIndex = 34; - this.ppChbxDisAutoDuplex.Text = "Disable Automatic Duplexing"; - this.ppChbxDisAutoDuplex.UseVisualStyleBackColor = false; - this.ppChbxDisAutoDuplex.CheckedChanged += new System.EventHandler(this.ppChbxDisAutoDuplex_CheckedChanged); - // // label17 // this.label17.AutoSize = true; @@ -2419,10 +2372,7 @@ namespace VEPROMS this.tcpOutputSettings.Controls.Add(this.ppBtnPDFLoc); this.tcpOutputSettings.Controls.Add(this.ppChbxAlwaysOvrWrtPDF); this.tcpOutputSettings.Controls.Add(this.label17); - this.tcpOutputSettings.Controls.Add(this.ppBtnDeftDisAutoDuplx); this.tcpOutputSettings.Controls.Add(this.ppBtnDefWatermark); - this.tcpOutputSettings.Controls.Add(this.ppChbxDisAutoDuplex); - this.tcpOutputSettings.Controls.Add(this.ppLblAutoDuplexDefault); this.tcpOutputSettings.Controls.Add(this.ppCmbxWatermark); this.tcpOutputSettings.Controls.Add(this.ppLblWatermarkDefault); this.tcpOutputSettings.DisabledBackColor = System.Drawing.Color.Empty; @@ -2905,8 +2855,6 @@ namespace VEPROMS private System.Windows.Forms.Label label17; private System.Windows.Forms.TextBox ppTxtBxPDFLoc; private System.Windows.Forms.Label label18; - private System.Windows.Forms.Label ppLblAutoDuplexDefault; - private System.Windows.Forms.CheckBox ppChbxDisAutoDuplex; private System.Windows.Forms.Label ppLblFormatDefault; private DevComponents.DotNetBar.SuperTooltip superTooltip1; private System.Windows.Forms.Label ppLblWatermarkDefault; @@ -2928,7 +2876,6 @@ namespace VEPROMS private System.Windows.Forms.Label ppLblDefSettingsInfo; private DevComponents.DotNetBar.Controls.CheckBoxX ppCbShwDefSettings; private DevComponents.DotNetBar.ButtonX ppBtnDefWatermark; - private DevComponents.DotNetBar.ButtonX ppBtnDeftDisAutoDuplx; private DevComponents.DotNetBar.ButtonX ppBtnPDFLoc; private DevComponents.DotNetBar.ButtonX ppBtnDefaultChgBar; private DevComponents.DotNetBar.ButtonX ppBtnDefCbTxt1; diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs index b0aa638f..8e3671cb 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs @@ -275,23 +275,6 @@ namespace VEPROMS // only allow update if association, and the RO update was not done and/or not completed ppBtnUpRoVals.Enabled = !_DocVersionConfig.MyDocVersion.ROfstLastCompleted || _DocVersionConfig.MyDocVersion.NewerRoFst; - // Set the auto duplex controls based on whether the format allows this: - // Note that the controls' visibility would not set correctly using the following two lines of code. That - // is why the more explicit logic was done. - //ppChbxDisAutoDuplex.Visible = _DocVersionConfig.MyDocVersion.MyFormat.PlantFormat.FormatData.PrintData.AllowDuplex; - //ppLblAutoDuplexDefault.Visible = ppBtnDeftDisAutoDuplx.Visible = ppLblAutoDuplexDefault.Visible; - if (_DocVersionConfig.MyDocVersion.MyFormat != null && _DocVersionConfig.MyDocVersion.MyFormat.PlantFormat.FormatData.PrintData.AllowDuplex) - { - ppChbxDisAutoDuplex.Visible = true; - ppLblAutoDuplexDefault.Visible = true; - ppBtnDeftDisAutoDuplx.Visible = true; - } - else - { - ppChbxDisAutoDuplex.Visible = false; - ppLblAutoDuplexDefault.Visible = false; - ppBtnDeftDisAutoDuplx.Visible = false; - } //add new applicability stuff if (_DocVersionConfig.Unit_Count > 0) @@ -886,9 +869,6 @@ namespace VEPROMS _DefaultWatermark = _DocVersionConfig.Print_Watermark.ToString(); SetupDefault(EnumDescConverter.GetEnumDescription(_DocVersionConfig.Print_Watermark), ppLblWatermarkDefault, ppCmbxWatermark); - // Get the default Disable Duplex - _DefaultDisableDuplex = _DocVersionConfig.Print_DisableDuplex; - ppLblAutoDuplexDefault.Text = string.Format("(Duplex {0})", (_DefaultDisableDuplex) ? "OFF" : "ON"); _DocVersionConfig.ParentLookup = false; } @@ -1094,13 +1074,6 @@ namespace VEPROMS } } - private void ppBtnDeftDisAutoDuplx_Click(object sender, EventArgs e) - { - ppChbxDisAutoDuplex.Checked = _DefaultDisableDuplex; - _DocVersionConfig.Print_DisableDuplex = ppChbxDisAutoDuplex.Checked; - ppBtnDeftDisAutoDuplx.Visible = false; - ppLblAutoDuplexDefault.Visible = false; - } private void frmVersionsProperties_Shown(object sender, EventArgs e) { @@ -1636,21 +1609,6 @@ namespace VEPROMS ppCmbxFormat.SelectedIndex = -1; } - /// - /// If checked, will disable automatic duplexing (ex Foldout Pages) - /// - /// - /// - private void ppChbxDisAutoDuplex_CheckedChanged(object sender, EventArgs e) - { - if (!_Initializing) - { - _DocVersionConfig.Print_DisableDuplex = ppChbxDisAutoDuplex.Checked; - ppBtnDeftDisAutoDuplx.Visible = (_DefaultDisableDuplex != ppChbxDisAutoDuplex.Checked); - ppLblAutoDuplexDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDeftDisAutoDuplx.Visible; - } - - } /// /// Enable or disable the user specified change bar options base on the type @@ -1834,7 +1792,6 @@ namespace VEPROMS ppLblChgBarTxtTypeDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefCbTxtTyp.Visible; //ppLblPaginationDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefPagination.Visible; ppLblWatermarkDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDefWatermark.Visible; - ppLblAutoDuplexDefault.Visible = ppCbShwDefSettings.Checked && ppBtnDeftDisAutoDuplx.Visible; } /// diff --git a/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs index 9a2f75b6..b2797317 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs @@ -545,44 +545,8 @@ namespace VEPROMS.CSLA.Library OnPropertyChanged("Print_Watermark"); } } - [Category("Print Settings")] - [DisplayName("Disable Automatic Duplexing")] - [RefreshProperties(RefreshProperties.All)] - [Description("Disable Duplex Printing")] - public bool Print_DisableDuplex - { - get - { - string s = _Xp["PrintSettings", "disableduplex"]; - //If there is no value to get, then get the parent value (a.k.a. default value). - if (s == string.Empty) - s = _Xp.ParentValue("PrintSettings", "disableduplex"); // get the parent value - // If there is no parent value, then use the volian default - if (s == string.Empty) - s = "false";// default to volian default - - return bool.Parse(s); - } - set - { - // if value being saved is same as the parent value, then clear the value (save blank). This will - // reset the data to use the parent value. - - string parval = _Xp.ParentValue("PrintSettings", "disableduplex"); // get the parent value - - if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default - parval = "false"; - - if (parval.Equals(value.ToString())) - _Xp["PrintSettings", "disableduplex"] = string.Empty; // reset to parent value - else - _Xp["PrintSettings", "disableduplex"] = value.ToString(); // save selected value - - OnPropertyChanged("Print_DisableDuplex"); - } - } - // C2019-004: Allow user to define duplex lank page text at the docversion level + // C2019-004: Allow user to define duplex blank page text at the docversion level [Category("Print Settings")] [DisplayName("Duplex Blank Page Text")] [RefreshProperties(RefreshProperties.All)] diff --git a/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs index 75abf38e..940b84d4 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs @@ -812,43 +812,6 @@ namespace VEPROMS.CSLA.Library OnPropertyChanged("Print_Watermark"); } } - [Category("Print Settings")] - [DisplayName("Disable Automatic Duplexing")] - [RefreshProperties(RefreshProperties.All)] - [Description("Disable Duplex Printing")] - public bool Print_DisableDuplex - { - get - { - string s = _Xp["PrintSettings", "disableduplex"]; - - //If there is no value to get, then get the parent value (a.k.a. default value). - if (s == string.Empty) - s = _Xp.ParentValue("PrintSettings", "disableduplex"); // get the parent value - // If there is no parent value, then use the volian default - if (s == string.Empty) - s = "false";// default to volian default - - return bool.Parse(s); - } - set - { - // if value being saved is same as the parent value, then clear the value (save blank). This will - // reset the data to use the parent value. - - string parval = _Xp.ParentValue("PrintSettings", "disableduplex"); // get the parent value - - if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default - parval = "False"; - - if (parval.Equals(value.ToString())) - _Xp["PrintSettings", "disableduplex"] = string.Empty; // reset to parent value - else - _Xp["PrintSettings", "disableduplex"] = value.ToString(); // save selected value - - OnPropertyChanged("Print_DisableDuplex"); - } - } // Change Bar Use from 16-bit code: // No Default // Without Change Bars diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ProcConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/ProcConfig.cs index adb5dd7b..d3a5468f 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/ProcConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/ProcConfig.cs @@ -607,43 +607,6 @@ namespace VEPROMS.CSLA.Library } } [Category("Print Settings")] - [DisplayName("Disable Automatic Duplexing")] - [RefreshProperties(RefreshProperties.All)] - [Description("Disable Duplex Printing")] - public bool Print_DisableDuplex - { - get - { - string s = _Xp["PrintSettings", "disableduplex"]; - - //If there is no value to get, then get the parent value (a.k.a. default value). - if (s == string.Empty) - s = _Xp.ParentValue("PrintSettings", "disableduplex"); // get the parent value - // If there is no parent value, then use the volian default - if (s == string.Empty) - s = "false";// default to volian default - - return bool.Parse(s); - } - set - { - // if value being saved is same as the parent value, then clear the value (save blank). This will - // reset the data to use the parent value. - - string parval = _Xp.ParentValue("PrintSettings", "disableduplex"); // get the parent value - - if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default - parval = "false"; - - if (parval.Equals(value.ToString())) - _Xp["PrintSettings", "disableduplex"] = string.Empty; // reset to parent value - else - _Xp["PrintSettings", "disableduplex"] = value.ToString(); // save selected value - - OnPropertyChanged("Print_DisableDuplex"); - } - } - [Category("Print Settings")] [DisplayName("Print All Not In Merge Pdfs")] [RefreshProperties(RefreshProperties.All)] [Description("Print All Do Not Include In Merge Pdfs")] diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index ca204abb..eae5674d 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1481,9 +1481,6 @@ namespace VEPROMS.CSLA.Library int firstInc = item.ActiveFormat.MyStepSectionLayoutData.PaginateOnFirstSubstep ? 0 : 1; ItemInfo parent = item.ActiveParent as ItemInfo; - // TODO: Format flag 'TreatAsSequential': - // The following needs to account for use of format flag 'TreatAsSequential' when doing - // formats that have it. if (item.IsExactType("And") || item.IsExactType("Or") || item.IsExactType("ImplicitOr")) level++; //if (item.ParentAndOr) @@ -3392,6 +3389,9 @@ namespace VEPROMS.CSLA.Library return retval; } + // used in some background document formats - all appear to be set on a Caution type. + // This will place the text of this type (caution) on the same row (of the page) and to the left of its parent. + // Is also used as a step designatior for Commanche Peak public bool SameRowAsParent { get @@ -4621,7 +4621,6 @@ namespace VEPROMS.CSLA.Library tbformat = tbformat.Replace("{ROMAN}", roman); tbformat = tbformat.Substring(0, tbformat.Length - ((roman.Length - 1) > 0 ? (roman.Length - 1) : 0)); } - if (ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.VirtualDotInHLSTab && tbformat.Contains("numeric") & ordinal > 9) _MyTab.AdjustTabSpace = true; if (tbformat.Contains("{numeric}") && ((MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_AddDotZeroStdHLS) == E_DocStructStyle.DSS_AddDotZeroStdHLS) && MyContent.Type == 20002) { tbformat = tbformat.Replace("{numeric}", ordinal.ToString().PadLeft(2) + ".0"); @@ -4963,7 +4962,7 @@ namespace VEPROMS.CSLA.Library && (LastRNO != null) && LastRNO.IsHigh && LastRNO.HasChildren && LastRNO.FirstChild(E_FromType.Step) != null && LastRNO.FirstChild(E_FromType.Step).IsSequential) { - level++; // 16bit has this: I didn't and mine worked most of time. + level++; if (ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ImperfectStructurePlus4) level += 2; if (ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ImperfectSubstep && !ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ImperfectStructurePlus4) PrintBias = -1; @@ -5891,12 +5890,6 @@ namespace VEPROMS.CSLA.Library get { return _RemovedStyleUnderline; } set { _RemovedStyleUnderline = value; } } - private bool _AdjustTabSpace = false; - public bool AdjustTabSpace - { - get { return _AdjustTabSpace; } - set { _AdjustTabSpace = value; } - } public Tab(VE_Font font) { MyFont = font; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 15a2d82c..eb2a7849 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -962,7 +962,6 @@ namespace VEPROMS.CSLA.Library return myReturn; } - // TODO: For hlp: LowerCaseTranNumber - lower case substep numbers in transitions private static bool AddTransitionProcNum(TransitionBuilder tb) // Coded for HLP { string retstr = tb._ToItem.MyProcedure.MyContent.Number; diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index 2c85aa55..52947440 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -11,6 +11,7 @@ namespace VEPROMS.CSLA.Library public class DocStyles : vlnFormatItem { [Description("Document Styles Name")] + //Not used in the PROMS code. Only used as a title for the DocStyles grouping private LazyLoad _Name; public string Name { @@ -65,6 +66,7 @@ namespace VEPROMS.CSLA.Library public DocStyle(XmlNode xmlNode) : base(xmlNode) { } public DocStyle() : base() { } #region IndexName + // a unuque number that is use in the SQL record to referenced the DocStyle for a seciton private LazyLoad _Index; public int? Index { @@ -74,6 +76,7 @@ namespace VEPROMS.CSLA.Library } } [Description("Document Styles Name")] + // Use in the lists that display the name of a seciton format style (Section Properties) private LazyLoad _Name; public string Name { @@ -84,6 +87,7 @@ namespace VEPROMS.CSLA.Library } #endregion #region Font + // the font to use for the section private VE_Font _Font; [Category("Font")] [DisplayName("Font")] @@ -101,7 +105,9 @@ namespace VEPROMS.CSLA.Library // This will adjust the top margin when the section title is not printed on the other pages. (CreateStepPDF() in PromsPrinter.cs) [Category("Miscellaneous")] [Description("AdjustTopMarginOnStepContinuePages")] - private LazyLoad _AdjustTopMarginOnStepContinuePages; + + // used with the "PSOnlyFirst" in pagelist so that a section title is printed only on the first page of the section. This will adjust the top margin when the section title is not printed on the other pages. + private LazyLoad _AdjustTopMarginOnStepContinuePages; public int AdjustTopMarginOnStepContinuePages { get @@ -115,6 +121,9 @@ namespace VEPROMS.CSLA.Library #region numberingsequence [Category("Miscellaneous")] [Description("Numbering Sequence")] + // defines how the page numbers are counted (i.e. count with procedure, + // count just within this section, don't count, etc). + // - see E_NumberingSequence in Enum.cs private LazyLoad _NumberingSequence; public E_NumberingSequence? NumberingSequence { @@ -123,10 +132,12 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NumberingSequence, "@NumberingSequence"); } } - #endregion + #endregion numberingsequence + #region IndexOtherThanFirstPage [Category("Miscellaneous")] [Description("IndexOtherThanFirstPage")] + // references the DocStyle to use for pages two through the last page of the section. this is used along with the "Where" setting "UseOnFirstPage" private LazyLoad _IndexOtherThanFirstPage; public int? IndexOtherThanFirstPage { @@ -135,7 +146,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _IndexOtherThanFirstPage, "@IndexOtherThanFirstPage"); } } - #endregion + #endregion IndexOtherThanFirstPage + #region SecOvrideSupInfoTabOff // This overrides the tab position of the Supplemental Information steps at the section level // This will also override the overall supplemental Information tab adjustment set at the format level (SupInfoTabOff) @@ -149,10 +161,13 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SecOvrideSupInfoTabOff, "@SecOvrideSupInfoTabOff"); } } - #endregion + #endregion SecOvrideSupInfoTabOff + #region IsStepSection [Category("Miscellaneous")] [Description("Is a Step Section")] + + // When set to True, the section uses the PROMS Step editor, when set to False, Word is used to edit the section contents private LazyLoad _IsStepSection; public bool IsStepSection { @@ -161,10 +176,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _IsStepSection, "@IsStepSection"); } } - #endregion + #endregion IsStepSection + #region Inactive [Category("Miscellaneous")] [Description("Is Active Section Type")] + + // when set to True, the section type is hidden from the user + // - but this section type could still be used "internally" by PROMS (i.e. when "Where" is set to "UseOnAllButFirstPage") + // - is also used to keep un-used section types around for future use private LazyLoad _Inactive; public bool Inactive { @@ -173,10 +193,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Inactive, "@Inactive"); } } - #endregion + #endregion Inactive + #region SupplementalInfo [Category("Miscellaneous")] [Description("Supports Supplemental Information")] + + // Use in SAMG procedures, flag that tells PROMS this section type can have Supplemental Information. + // This information is entered as an RNO off of a step but is printed on the backside of the previous page + // (like a foldout page) so that it is visable along with the steps that it applies. private LazyLoad _SupplementalInformation; public bool SupplementalInformation { @@ -185,8 +210,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SupplementalInformation, "@SupplementalInformation"); } } - // B2023-060: Pagination - if section uses supplemental information, use the Section's properties/pagination (continuous or - // separate) rather than always setting to separate + + // B2023-060: Procedures with Supplemental Information will assume that all sections are printed separately. + // This flag will use the Section's properties/pagination (continuous or separate) + // rather than always setting to separate [Category("Miscellaneous")] [Description("Supports Supplemental Information Pagination")] private LazyLoad _SupInfoNoPaginOverride; @@ -197,9 +224,11 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SupInfoNoPaginOverride, "@SupInfoNoPaginOverride"); } } + // F2023-035: WCN - allow for change in left margin for supplemental information pages by - // setting a value in the DocStyle for the adjustment. This is used when importing the vlnParagraph page - // page & when doing pagelist items + // setting a value in the DocStyle for the adjustment. This is used when importing the vlnParagraph page + // page & when doing pagelist items + // summary: adjustment to the left margin for the associated supplemental information pages private LazyLoad _SupInfoMargAdj; public float? SupInfoMargAdj { @@ -208,11 +237,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SupInfoMargAdj, "@SupInfoMargAdj"); } } - - #endregion + + #endregion SupplementalInfo + #region LandscapePageList [Category("Miscellaneous")] [Description("Should PageList be landscape")] + + // this will rotate the associated PageStyle information 180 degrees to the left private LazyLoad _LandscapePageList; public bool LandscapePageList { @@ -221,11 +253,13 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _LandscapePageList, "@LandscapePageList"); } } - #endregion + #endregion LandscapePageList + #region ShowSectionTitles [Category("Miscellaneous")] [Description("Should Section Titles be shown")] private LazyLoad _ShowSectionTitles; + // like the ShowSectionTitles at the StepSectionLayData level - turns on printing the section number and title on the first page of the section. This allows it to be controled based on which section type was selected, so long as it's set to false at the StepSectionLayData level. public bool ShowSectionTitles { get @@ -233,10 +267,12 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ShowSectionTitles, "@ShowSectionTitles"); } } - #endregion + #endregion ShowSectionTitles + #region ResetFirstPageOnSection [Category("Miscellaneous")] [Description("Reset first page of section on Separate pagination section")] + // put in for V.C. Summer private LazyLoad _ResetFirstPageOnSection; public bool ResetFirstPageOnSection { @@ -245,10 +281,13 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ResetFirstPageOnSection, "@ResetFirstPageOnSection"); } } - #endregion + #endregion ResetFirstPageOnSection + #region IncludeInTOC [Category("Miscellaneous")] [Description("Include in Auto Table Of Contents")] + + // this will include the section in the Automatic Table Of Contents by default (unless it's turned off in Section Properties) private LazyLoad _IncludeInTOC; public bool IncludeInTOC { @@ -257,10 +296,13 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _IncludeInTOC, "@IncludeInTOC"); } } - #endregion + #endregion IncludeInTOC + #region UseCheckOffs [Category("Miscellaneous")] [Description("Section Uses Checkoffs")] + + // turns on the ability for a step editor section to have checkoffs private LazyLoad _UseCheckOffs; public bool UseCheckOffs { @@ -269,10 +311,12 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseCheckOffs, "@UseCheckOffs"); } } - #endregion + #endregion UseCheckOffs + #region UseCheckOffs [Category("Miscellaneous")] [Description("Section Uses MetaSection ColSByLevel")] + // the section uses the MetaSection ColSByLevel setting (based on step text level) to position the step on the page private LazyLoad _UseColSByLevel; public bool UseColSByLevel { @@ -281,22 +325,12 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseColSByLevel, "@UseColSByLevel"); } } - #endregion - #region Oldtonew - [Category("Miscellaneous")] - [Description("Convert from old to new")] - private LazyLoad _OldToNew; - public int? OldToNew - { - get - { - return LazyLoad(ref _OldToNew, "@OldToNew"); - } - } - #endregion + #endregion UseCheckOffs + #region CancelSectTitle [Category("Miscellaneous")] [Description("Section Cancel Section Title")] + // this will prevent the section number and title from printing at the beginning of the section. This is set to false when the section number and/or title is printed from the PageStyle instead private LazyLoad _CancelSectTitle; public bool CancelSectTitle { @@ -305,7 +339,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CancelSectTitle, "@CancelSectTitle"); } } - #endregion + #endregion CancelSectTitle + #region DontInsertBlankPages [Category("Miscellaneous")] [Description("Don't insert blank pages in this section when printing duplex with blank pages")] @@ -318,13 +353,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _DontInsertBlankPages, "@DontInsertBlankPages"); } } - #endregion + #endregion DontInsertBlankPages + #region CenterLine //CenterLineX="261.9" CenterLineYTop="673.2" CenterLineYBottom="44.2" private LazyLoad _CenterLineX; [Category("CenterLine")] [DisplayName("X Location")] [Description("Distance from left side of page")] + // horizontal positon of a center line that is drawn on the printed page public float? CenterLineX { get @@ -332,6 +369,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CenterLineX, "@CenterLineX"); } } + + // the vertical starting positon of a center line that is drawn on the printed page private LazyLoad _CenterLineYTop; [Category("CenterLine")] [DisplayName("Y Top Location")] @@ -343,6 +382,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CenterLineYTop, "@CenterLineYTop"); } } + + // the vertical ending positon of a center line that is drawn on the printed page private LazyLoad _CenterLineYBottom; [Category("CenterLine")] [DisplayName("Y Bottom Location")] @@ -354,10 +395,13 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CenterLineYBottom, "@CenterLineYBottom"); } } + private LazyLoad _CLineWidth; [Category("CenterLine")] [DisplayName("Line Width")] [Description("Width of Lines Internal to Boxes")] + + // overrides the default pen width (.95) used to draw the center line public float? CLineWidth { get @@ -365,10 +409,13 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CLineWidth, "@CLineWidth"); } } - #endregion + #endregion CenterLine + #region OptionalSectionContent [Category("Miscellaneous")] [Description("Section Optional Content")] + + // don't print the "No Section Content" message when section is empty private LazyLoad _OptionalSectionContent; public bool OptionalSectionContent { @@ -377,10 +424,13 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _OptionalSectionContent, "@OptionalSectionContent"); } } - #endregion + #endregion OptionalSectionContent + #region Section Number Flags [Category("Miscellaneous")] [Description("Don't parse the section number - use DisplayNumber value")] + + // when creating a section tab, use as was entered in section properties private LazyLoad _DontParseSectionNumber; public bool DontParseSectionNumber { @@ -390,9 +440,13 @@ namespace VEPROMS.CSLA.Library } } #endregion + #region SpecialStepsFoldout [Category("Miscellaneous")] [Description("Section Special Steps Foldout")] + + // (for step editor foldouts) reduces white space on the foldout page to allow more information on the page, + // also special handling of step tabs when section numbers normally are part of step numbers private LazyLoad _SpecialStepsFoldout; public bool SpecialStepsFoldout { @@ -401,8 +455,11 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpecialStepsFoldout, "@SpecialStepsFoldout"); } } + [Category("Miscellaneous")] [Description("Section Special Steps Foldout with white space")] + + // allow for all of the other special foldout formatting, but not compress the page private LazyLoad _SpecialStepsFoldoutKeepWhiteSpace; public bool SpecialStepsFoldoutKeepWhiteSpace { @@ -411,8 +468,11 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpecialStepsFoldoutKeepWhiteSpace, "@SpecialStepsFoldoutKeepWhiteSpace"); } } + [Category("Miscellaneous")] [Description("Section Extra Line Header")] + // add and extra blank line before a Caution/Note header, appears to be used with SpecialStepsFoldout logic + // and the SpaceIn set on Caution and Note step types private LazyLoad _ExtraLineHeader; public bool ExtraLineHeader { @@ -421,10 +481,13 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ExtraLineHeader, "@ExtraLineHeader"); } } - #endregion + #endregion SpecialStepsFoldout + #region UndSpecialStepsFoldout [Category("Miscellaneous")] [Description("Section Cancel Section Title")] + + // used in Foldout section types, will underline the High Level Steps of a Foldout (Step Editor Section) private LazyLoad _UndSpecialStepsFoldout; public bool UndSpecialStepsFoldout { @@ -433,11 +496,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UndSpecialStepsFoldout, "@UndSpecialStepsFoldout"); } } - #endregion + #endregion UndSpecialStepsFoldout + #region CoverNoMergedPageNum [Category("Miscellaneous")] [Description("Cover Page Do Not Show Page Count")] - private LazyLoad _CoverNoMergedPageNum; // F2021-046: flag if cover page section doesn't print page number on first page of merged pdf: + + // F2021-046: When doing the Merge option when printing all procedures, flag if cover page section + // doesn't print the merged page number on first page of the merged pdf (used in printing Alarm Procedure sets) + private LazyLoad _CoverNoMergedPageNum; public bool CoverNoMergedPageNum { get @@ -445,10 +512,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CoverNoMergedPageNum, "@CoverNoMergedPageNum"); } } - #endregion + #endregion CoverNoMergedPageNum + #region AlignHLSTabWithSect [Category("Miscellaneous")] [Description("Align HLS Tab With Sect")] + + // Align the starting position of the High Level Step to be under the section header (section title). + // The step width is also ajusted to fit within the page margins private LazyLoad _AlignHLSTabWithSect; public bool AlignHLSTabWithSect { @@ -457,10 +528,17 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AlignHLSTabWithSect, "@AlignHLSTabWithSect"); } } - #endregion + #endregion AlignHLSTabWithSect + #region AdjSectTitleLoc [Category("Miscellaneous")] [Description("Adjust Section Title Location")] + + // When high level steps are used as the high level section number and title (a ".0" is added to the high level + // step number). This flag adds additional tabbing logic (location & numbering) and deals with printing + // the INITIAL header (checkoffs/signoffs) when then continuous pagination is set with other sections. + // This was added to support Barakah’s meta sections step/sub-step tabbing and the INITIAL sign off header + // placement in the page header. private LazyLoad _AdjSectTitleLoc; public bool AdjSectTitleLoc // B2022-129: don't indent HLS when flag is on (Barakah - single column step attachment with meta sect) { @@ -469,12 +547,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AdjSectTitleLoc, "@AdjSectTitleLoc"); } } - #endregion + #endregion AdjSectTitleLoc + #region ShowAlarmPointWindowInfo [Category("Miscellaneous")] [Description("Show Alarm Point Table Info in Step Editor")] - private LazyLoad _ShowAlarmPointWindowInfo; + //C2021-018 show alarm point RO data in step editor (BNPP Alarms) + // used to display Alarm Point Table RO values in the editor. A read-only Note type is used, off of step the section title, to display the Alarm Point table RO information. + private LazyLoad _ShowAlarmPointWindowInfo; public bool ShowAlarmPointWindowInfo { get @@ -482,10 +563,17 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ShowAlarmPointWindowInfo, "@ShowAlarmPointWindowInfo"); } } - #endregion + #endregion ShowAlarmPointWindowInfo + #region ComponentList [Category("Miscellaneous")] [Description("Component List")] + + // this is used generate a could different types of section and step formatting. + // Along with this flag, it uses a Template (defined in the format file) + // and specially defined step and sub-step types to create specialized formatting when printed. + // It's used for Calvert Cliffs Alarm Point pages, Calvert Cliffs Valve List sections, + // and Farley Component List tales (Figure section in EOP procedures). private LazyLoad _ComponentList; public bool ComponentList { @@ -494,12 +582,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ComponentList, "@ComponentList"); } } - #endregion + #endregion ComponentList + #region pagestyle private PageStyle _pagestyle; [Category("Miscellaneous")] [DisplayName("Page Style")] [Description("Page Style")] + + // Get the PageStyle associated with the DocStyle public PageStyle pagestyle { get @@ -510,7 +601,8 @@ namespace VEPROMS.CSLA.Library return _pagestyle; } } - #endregion + #endregion pagestyle + #region SubElements private Layout _Layout; public Layout Layout @@ -595,6 +687,8 @@ namespace VEPROMS.CSLA.Library [Category("Layout")] [DisplayName("Top Margin on Printed Page")] [Description("Top Margin on Printed Page")] + + // The top point of the printed page to start printing the step text (or section number/title) public float? TopMargin { get @@ -608,6 +702,8 @@ namespace VEPROMS.CSLA.Library [Category("Location")] [DisplayName("Number of lines required for footer")] [Description("Number of lines required for footer")] + + // space to reserve if needed for bottom page messages (ex: continue message) public float? FooterLength { get @@ -615,11 +711,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _FooterLength, "@FooterLength"); } } + #endregion + #region ChangeBarAdjustment // B2023-052: Beaver Valley - Inconsistent change bar location private LazyLoad _AbsChgBarAdj; [Category("Location")] [DisplayName("Absolute change bar adjustment for margin differences")] [Description("Absolute change bar adjustment for margin differences")] + + // when AbsoluteFixedChangeColumn flag is used it is from the LeftMargin. If a unique section has a different LeftMarge define, change bars in that section will not be located at the same location as the other sections. This allows for an adjustment to the change bar location to match the other sections public float? AbsChgBarAdj { get @@ -627,12 +727,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AbsChgBarAdj, "@AbsChgBarAdj"); } } - #endregion + #endregion ChangeBarAdjustment + #region LeftMargin private LazyLoad _LeftMargin; [Category("Location")] [DisplayName("Size of left margin")] [Description("Size of left margin")] + + // the absolute left position on the printed page that text can be printed. other format variables and PageStyle column positions used this as the starting reference point public float? LeftMargin { get @@ -662,12 +765,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _LeftMargin, "@LeftMargin"); } } - #endregion + #endregion LeftMargin + #region PageLength private LazyLoad _PageLength; [Category("Location")] [DisplayName("Length of Page")] [Description("Length of Page")] + + // the length of the printable area for step text (also for Word sections) - used to determin page breaks when printing public float? PageLength { get @@ -698,12 +804,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PageLength, "@PageLength"); } } - #endregion + #endregion PageLength + #region PageWidth private LazyLoad _PageWidth; [Category("Location")] [DisplayName("Width of Page")] [Description("Width of Page")] + + // width of the printed page from the LeftMargin (defines the Right Margin of the section) public float? PageWidth { get @@ -711,12 +820,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PageWidth, "@PageWidth"); } } - #endregion + #endregion PageWidth + #region MSWordXAdj private LazyLoad _MSWordXAdj; [Category("Location")] [DisplayName("MSWord X Adjustment")] [Description("X Placement of PDF during Print")] + + // used for landscape Word sections, adjusts the Horizontal position on the printed page public float? MSWordXAdj { get @@ -724,12 +836,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _MSWordXAdj, "@MSWordXAdj"); } } - #endregion + #endregion MSWordXAdj + #region MSWordYAdj private LazyLoad _MSWordYAdj; [Category("Location")] [DisplayName("MSWord Y Adjustment")] [Description("Y Placement of PDF during Print")] + + // used for landscape Word sections, adjusts the Vertical position on the printed page public float? MSWordYAdj { get @@ -737,12 +852,17 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _MSWordYAdj, "@MSWordYAdj"); } } - #endregion + #endregion MSWordYAdj + #region SectionMacro private LazyLoad _SectionMacro; [Category("Extras")] [DisplayName("Section Macro")] [Description("Section Macro Prints With Title")] + + // will print a defined print macro with the section title. + // (ex. Westinghouse Alarms format will print a solid line before the section title + // for the "Line Above Section Title" section style) public string SectionMacro { get @@ -750,10 +870,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SectionMacro, "@SectionMacro"); } } - #endregion + #endregion SectionMacro + + #region CenterToStepThenPage [Category("Layout")] [Description("CenterToStepThenPage")] + + // centering position of Tables and Figures is calulated first with repect to the table or figure width, then that positionm is centered with respect the printable page width and left margin private LazyLoad _CenterToStepThenPage; public bool CenterToStepThenPage { @@ -762,10 +886,11 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CenterToStepThenPage, "@CenterToStepThenPage"); } } - #endregion + #endregion CenterToStepThenPage } - #endregion - #region SectTop + #endregion Layout + + #region SectTopWcnTraining [TypeConverter(typeof(ExpandableObjectConverter))] public class SectTop : vlnFormatItem { @@ -789,6 +914,8 @@ namespace VEPROMS.CSLA.Library [Category("Section Continue Msg")] [DisplayName("Margin for Section top msg")] [Description("Margin for Section top msg")] + + // used to position Responsibility text for Wolf Creek Training format public float? Margin { get @@ -796,12 +923,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Margin, "@Margin"); } } - #endregion + #endregion Margin + #region MaxLen private LazyLoad _MaxLen; [Category("Section Continue Msg")] [DisplayName("MaxLen for text within the column")] [Description("MaxLen for text within the column")] + + // the maxium length of Responsibility text (Wolf Creek Training format) public int? MaxLen { get @@ -809,12 +939,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _MaxLen, "@MaxLen"); } } - #endregion + #endregion MaxLen #region Message private LazyLoad _Message; [Category("Continue Msg")] [DisplayName("Section Top Continue Msg")] [Description("Section Top Continue Msg")] + + // top continue message used only for Wolf Creek Training format public string Message { get @@ -822,9 +954,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Message, "@Message"); } } - #endregion + #endregion Message } - #endregion + #endregion SectTopWcnTraining + #region ContinueAll #region Continue [TypeConverter(typeof(ExpandableObjectConverter))] @@ -897,6 +1030,8 @@ namespace VEPROMS.CSLA.Library [Category("Continue Msg")] [DisplayName("Margin for top msg")] [Description("Margin for top msg")] + + //value added to the left margin when calculating the center point of a top continue message. public float? Margin { get @@ -904,7 +1039,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Margin, "@Margin"); } } - #endregion + #endregion Margin + #region RowOverride // C2019-044 put in for Barakah Single Column format // specify the row to put the top continue message @@ -921,11 +1057,14 @@ namespace VEPROMS.CSLA.Library } } #endregion + #region UseStepTabs private LazyLoad _UseStepTabs; [Category("Continue Msg")] [DisplayName("Flag to use step tabs")] [Description("Flag to use step tabs")] + + // added for Comanche Peak will print out step tabs as a top comtinue message. public bool UseStepTabs { get @@ -933,12 +1072,21 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseStepTabs, "@UseStepTabs"); } } - #endregion + #endregion UseStepTabs + #region HLS private LazyLoad _HLS; [Category("Continue Msg")] [DisplayName("Include HLS in top continue msg")] [Description("Include HLS in top continue msg")] + + // include the High Level Step in the top continue message + // - see DoTopContinueMsg in VlnParagraph for details + // set to "1" will use high level step tab and text + // set to "4" the high level step text is the section title, appears when fist level sub-step breaks + // set to "7" similar logic as "4" but for Vogtle Main Control Room alarms but use high level step text + // set to "6" handle when break occures on Caution/Note + // set to "3" special logic for Calvert Cliffs Alarms (the two column part) public int? HLS { get @@ -946,12 +1094,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _HLS, "@HLS"); } } - #endregion + #endregion HLS + #region PlaceAtLeftMargin private LazyLoad _PlaceAtLeftMargin; // F2019-033 only use the Left Margin plus any Top message margin [Category("Continue Msg")] [DisplayName("Flag to position at left margin")] [Description("Flag to position at left margin")] + + // position the top continue message with respect only to the left margin public bool PlaceAtLeftMargin { get @@ -959,7 +1110,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PlaceAtLeftMargin, "@PlaceAtLeftMargin"); } } - #endregion + #endregion PlaceAtLeftMargin + #region Message private LazyLoad _RemoveBullet; public bool RemoveBullet // C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet. @@ -969,10 +1121,13 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RemoveBullet, "@RemoveBullet"); } } + private LazyLoad _Message; [Category("Continue Msg")] [DisplayName("Top Continue Msg")] [Description("Top Continue Msg")] + + // the top continue message string - may caontain special formatting items - see DoTopContinueMsg in vlnParagraph for different format settings public string Message { get @@ -980,9 +1135,11 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Message, "@Message"); } } - #endregion + #endregion Message } - #endregion + + #endregion Top + #region Bottom [TypeConverter(typeof(ExpandableObjectConverter))] public class Bottom : vlnFormatItem @@ -1007,6 +1164,8 @@ namespace VEPROMS.CSLA.Library [Category("Continue Msg")] [DisplayName("Margin for bottom msg")] [Description("Margin for bottom msg")] + + // horitzontal position of the bottom continue message from the left margin public float? Margin { get @@ -1014,12 +1173,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Margin, "@Margin"); } } - #endregion + #endregion Margin + #region MarginR BGE private LazyLoad _MarginR; [Category("Continue Msg")] [DisplayName("Margin for bottom msg RNO Column (if in both columns)")] [Description("Margin for bottom msg RNO Column (if in both columns)")] + + // horitzontal position from the left margin for a RNO bottom continue message public float? MarginR { get @@ -1027,20 +1189,23 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _MarginR, "@MarginR"); } } - #endregion + #endregion MarginR BGE + #region Location [Category("Continue Msg")] [Description("Bottom Continue Location")] - - private LazyLoad _NumberingSequence; - public E_NumberingSequence? NumberingSequence - { - get - { - return LazyLoad(ref _NumberingSequence, "@NumberingSequence"); - } - } private LazyLoad _Location; + + // location of the bottom continue message + // E_ContBottomLoc list (ENum.cs): + // EndOfText = 0, + // BtwnTextAndBottom = 1, + // BottomOfPage = 2, + // BelowBottom1 = 3, + // BottomWithFooter = 4, - added for BGE for Alarms. This puts continue message on bottom AND if in CONDITION/RESPONSE table, at bottom of both columns. + // EndOfText2 = 5, + // BtwnTextAndBottom2 = 6 - Added for BGE, their continue message was a line or so too far down the page + public E_ContBottomLoc? Location { get @@ -1048,6 +1213,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Location, "@Location"); } } + + // flag for cases where step text was printing on top of the bottom continue messsage due to how a step was paginated - put in for Farley private LazyLoad _NoOverrideSpace; public bool NoOverrideSpace { @@ -1056,6 +1223,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoOverrideSpace, "@NoOverrideSpace"); } } + + // Location Adjustment of the calculated vertical position of the bottom continue message (from Location setting) private LazyLoad _LocAdj; public int? LocAdj { @@ -1065,7 +1234,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _LocAdj, "@LocAdj"); } } - #endregion + #endregion Location + #region Message private LazyLoad _RemoveBullet; public bool RemoveBullet // C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet. @@ -1075,10 +1245,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RemoveBullet, "@RemoveBullet"); } } + private LazyLoad _Message; [Category("Continue Msg")] [DisplayName("Bottom Continue Msg")] [Description("Bottom Continue Msg")] + + //the bottom continue message string - may caontain special formatting items + //- see DoBottomContinueMsg in vlnParagraph for different format settings public string Message { get @@ -1086,9 +1260,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Message, "@Message"); } } - #endregion + #endregion Message } - #endregion + #endregion Bottom + #region SectionTitle [TypeConverter(typeof(ExpandableObjectConverter))] public class SectionTitle : vlnFormatItem @@ -1100,6 +1275,8 @@ namespace VEPROMS.CSLA.Library [Category("Section Title Continue Msg")] [DisplayName("AppendToTitle")] [Description("Append Text to Section Title For Continue Msg")] + + // continue message to add to the section title public string AppendToTitle { get @@ -1107,10 +1284,11 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AppendToTitle, "@AppendToTitle"); } } - #endregion + #endregion AppendToTitle } - #endregion //SectionTitle - continue setting - #endregion + #endregion //SectionTitle - continue setting + #endregion ContinueAll + #region End [TypeConverter(typeof(ExpandableObjectConverter))] public class End : vlnFormatItem @@ -1135,6 +1313,8 @@ namespace VEPROMS.CSLA.Library [Category("End Msg")] [DisplayName("End Msg Exists")] [Description("End Msg Exists")] + + // vertical positon adjustment of the End message public int? Flag { get @@ -1142,12 +1322,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Flag, "@Flag"); } } - #endregion + #endregion Flag + #region Message private LazyLoad _Message; [Category("End Msg")] [DisplayName("End Message")] [Description("End Message")] + + // End Message Text public string Message { get @@ -1155,6 +1338,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Message, "@Message"); } } + public string FixedMessage { get @@ -1162,6 +1346,8 @@ namespace VEPROMS.CSLA.Library return Message == null ? null : Message.Replace("\n","\r\n").Replace(@"{par}","\r\n"); } } + + // amount of space from the left margin to print the End Message private LazyLoad _Margin; public float? Margin { @@ -1170,6 +1356,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Margin, "@Margin"); } } + + // print the end message at the end of each sub-section private LazyLoad _EndMessageOnEachSubSection; public bool EndMessageOnEachSubSection { @@ -1178,9 +1366,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _EndMessageOnEachSubSection, "@EndMessageOnEachSubSection"); } } - #endregion + #endregion Message } - #endregion + #endregion End + #region Final [TypeConverter(typeof(ExpandableObjectConverter))] public class Final : vlnFormatItem @@ -1191,6 +1380,8 @@ namespace VEPROMS.CSLA.Library [Category("Final Msg")] [DisplayName("Final Message")] [Description("Final Message")] + + // Final Message text to be printed on last page of procedure public string Message { get @@ -1199,7 +1390,8 @@ namespace VEPROMS.CSLA.Library } } } - #endregion + #endregion Final + #region StructureStyle [TypeConverter(typeof(ExpandableObjectConverter))] public class StructureStyle : vlnFormatItem @@ -1210,6 +1402,13 @@ namespace VEPROMS.CSLA.Library [Category("Structure Style")] [Description("Where Used")] private LazyLoad _Where; + + // where with repect to the section is this DocStyle/PageList relationship used: + // UseOnAllPages (all pages of the section), UseOnFirstPage (only the first page of the section), + // UseOnAllButFirstPage (all except for the first page of the section). + // Note that when UseOnFirstPage is used, it but reference a DocStyle (IndexOtherThanFirstPage) + // that uses UseOnAllButFirstPage. + public E_DocStyleUse? Where { get @@ -1217,10 +1416,13 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Where, "@Where"); } } - #endregion + #endregion Where + #region Style [Category("Structure Style")] [Description("Style")] + + // allow us to identify a specialized type of section (Table of Contents, Foldout Page, etc) as well as other unique formatting that deviates from the normal formatting/data entry of the procedure. See "E_DocStructStyle" in VEPROMS.CSLA.Library\ENums.cs for alist of the possible flags and descriptions. private LazyLoad _Style; public E_DocStructStyle? Style { @@ -1229,8 +1431,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Style, "@Style"); } } - #endregion + #endregion Style } - #endregion - #endregion + #endregion StructureStyle + #endregion DocStyleAll } diff --git a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs index beb4276d..27a22aee 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs @@ -127,10 +127,6 @@ namespace VEPROMS.CSLA.Library [Flags] public enum E_DocStructStyle : ulong { - //USEONALLPAGES = 0, // Default - //USEONFIRSTPAGE = 1, // Use only on the first page - //USEONALLBUTFIRSTPAGE = 2, // Use on all but the first page - //USEONLASTPAGE = 4, // NO LOGIC exists for this selection. Use only on the last page None = 0, UseSectionFoldout = 8, // Attach section foldouts (only active if using SectionLevelFoldouts_ON DontCountFoldoutPgs = 16, // Used with the USESECTIONFOLDOUT flag. Keeps foldout pages from @@ -138,7 +134,7 @@ namespace VEPROMS.CSLA.Library TableOfContents = 32, DontCountInTabOfCont = 64, Placekeeper = 128, - Align1StLevSubWHLS = 0x00000100, // guess? + Align1StLevSubWHLS = 0x00000100, // the first level sub-step will start at the same column as the high level step DoubleBoxHLS = 0x00000200, UseAltCntrline = 0x00000400, DontNumberInTOC = 0x00000800, // Don't include page number for this section in the Table of Contents diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs index df70d5d1..a1af31b5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs @@ -21,6 +21,7 @@ namespace VEPROMS.CSLA.Library public PageStyle() : base() { } #endregion #region Business Methods + // description to associate with a DocStyle private LazyLoad _Name; [DisplayName("Name")] [Description("Page Style Name")] @@ -31,6 +32,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Name, "@Name"); } } + + // a unuque number that is referenced from the DocStyles private LazyLoad _Index; [DisplayName("Index")] [Description("Page Style Index")] @@ -41,6 +44,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Index, "@Index"); } } + private PageItems _PageItems; public PageItems PageItems { @@ -66,6 +70,7 @@ namespace VEPROMS.CSLA.Library } #endregion #region PageItem + // this links up the group in public class PageItem : vlnFormatItem { #region Constructor @@ -92,6 +97,8 @@ namespace VEPROMS.CSLA.Library return (_RelatedItem == null) ? _RelatedItem = new RelatedItem(SelectSingleNode("RelatedItem")) : _RelatedItem; } } + + // this can be an actual token, in curly braces, that dynamically gets replaced with information, or just plain text private LazyLoad _Token; [Category("Content")] [DisplayName("Content")] @@ -103,6 +110,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Token, "@Token"); } } + + // the row on the page to place the Item private LazyLoad _Row; [Category("Location")] [DisplayName("Vertical Position")] @@ -114,6 +123,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Row, "@Row"); } } + + // the column on the page to place the Item private LazyLoad _Col; [Category("Location")] [DisplayName("Horizontal Position")] @@ -125,6 +136,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Col, "@Col"); } } + + // the justification at the Col position in which to print the Token information private LazyLoad _Justify; public E_Justify? Justify { @@ -133,6 +146,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Justify, "@Justify"); } } + + //run the PROMS Replace Words logic on the resulting text of Token private LazyLoad _RepWords; // F2021-053: Do replace words in page list public bool RepWords { @@ -141,6 +156,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RepWords, "@RepWords"); } } + + //Flag to tell PROMS to get the alarm value information based on the specified Child applicability private LazyLoad _ROLkUpMatch; // C2021-065 (BNPP Alarms format) public bool ROLkUpMatch { @@ -149,6 +166,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ROLkUpMatch, "@ROLkUpMatch"); } } + + // Flag to specify if that PageStyle Item should be used in creating alarm point information + // for viewing in the PROMS step editor + // this information is displayed in a Note that it build on the fly when first opening an Alarm Point page private LazyLoad _ROLkUpInEditor; // C2021-018 (BNPP Alarms format) public bool ROLkUpInEditor { @@ -157,6 +178,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ROLkUpInEditor, "@ROLkUpInEditor"); } } + + // defines a maxium width before the resolved PSI token (procedure specific information) text is wrapped + // on to the next line private LazyLoad _MaxWidth; public int? MaxWidth { @@ -165,6 +189,7 @@ namespace VEPROMS.CSLA.Library return (LazyLoad(ref _MaxWidth, "@MaxWidth")); } } + // MaxWidth, above, flagged that, if there was more than 1 line, the topmargin would be adjusted by however // many lines the PSI item contained (for wst alarms). The MaxWidthCurPage is used when that adjustment // should not be made, the length of the PSI item is only relevant for the current page. @@ -177,6 +202,8 @@ namespace VEPROMS.CSLA.Library return (LazyLoad(ref _MaxWidthCurPage, "@MaxWidthCurPage")); } } + + // the resolved pagestype item font size will be reduce in order to fit within the defined width private LazyLoad _FontShrinkAftLen; // F2021-066 & 070 (text len before shrinking font) public int? FontShrinkAftLen { @@ -185,6 +212,8 @@ namespace VEPROMS.CSLA.Library return (LazyLoad(ref _FontShrinkAftLen, "@FontShrinkAftLen")); } } + + // used in Alarm Point Table page style values with FontShrinkAftLen set, will display this message if the text cannot be shrunk enough (and be readable) to fit within the defined width private LazyLoad _FontTooSmallMsg; // F2021-066 message if can't shrink enough public string FontTooSmallMsg { @@ -193,7 +222,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _FontTooSmallMsg, "@FontTooSmallMsg"); } } + // F2023-039 allow to select text color of a pagelist line + // sets a text color for the page style Item private LazyLoad _TextColor; public string TextColor { @@ -202,6 +233,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TextColor, "@TextColor"); } } + + // set to a string, will remove the matching string from the end // F2023-112 Vogtle Units 3 & Backgrounds - trim the ending "-B" from the procedure number (used in title box of page header) private LazyLoad _TrimEnding; public string TrimEnding @@ -235,6 +268,8 @@ namespace VEPROMS.CSLA.Library public RelatedItem() : base() { } #endregion #region Business Methods + + // the name of the PSI logical token to check private LazyLoad _Token; [Category("RelatedContent")] [DisplayName("RelatedContent")] @@ -246,6 +281,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Token, "@Token"); } } + + // new Row value to use for PageStyle Item private LazyLoad _Row; [Category("Location")] [DisplayName("Vertical Position")] @@ -257,6 +294,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Row, "@Row"); } } + + // new Col value to use for PageStyle Item private LazyLoad _Col; [Category("Location")] [DisplayName("Horizontal Position")] @@ -268,6 +307,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Col, "@Col"); } } + + // new Justify value to use for PageStyle Item private LazyLoad _Justify; public E_Justify? Justify { diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index faf65a31..153cd329 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -546,6 +546,8 @@ namespace VEPROMS.CSLA.Library return _Font == null? _Font = new VE_Font(base.XmlNode): _Font; } } + + // Defines the printed page size (ex: US Letter, A4) private PDFPageSize _PDFPageSize; public PDFPageSize PDFPageSize // C2020-002 paper size is now set in the format files { @@ -594,6 +596,7 @@ namespace VEPROMS.CSLA.Library } set { _SymbolList = value; } } + // gets the high level node that contains setting used in the procedure step editor private EditData _EditData; public EditData EditData { @@ -602,6 +605,7 @@ namespace VEPROMS.CSLA.Library return _EditData == null ? _EditData = new EditData(SelectSingleNode("EditData")): _EditData; } } + // gets the high level node that contains settings used to generate PDFs (print) private PrintData _PrintData; public PrintData PrintData { @@ -610,6 +614,7 @@ namespace VEPROMS.CSLA.Library return _PrintData == null? _PrintData = new PrintData(SelectSingleNode("PrintData")):_PrintData; } } + // get high level node containing settings used for both edit and print private ProcData _ProcData; public ProcData ProcData { @@ -618,6 +623,7 @@ namespace VEPROMS.CSLA.Library return _ProcData == null? _ProcData = new ProcData(SelectSingleNode("ProcData")):_ProcData; } } + // get high level node containing settings pertraining to sections of a procedure private SectData _SectData; public SectData SectData { @@ -626,6 +632,7 @@ namespace VEPROMS.CSLA.Library return _SectData == null? _SectData = new SectData(SelectSingleNode("SectData")):_SectData; } } + // get a list of box formatting information primarily used for Cautions, Notes, and Warnings. private BoxList _BoxList; public BoxList BoxList { @@ -635,6 +642,7 @@ namespace VEPROMS.CSLA.Library } set { _BoxList = value; } } + // gets a list of trainsition formatting information for various types of transitions private TransData _TransData; public TransData TransData { @@ -643,6 +651,7 @@ namespace VEPROMS.CSLA.Library return _TransData == null? _TransData = new TransData(SelectSingleNode("TransData")):_TransData; } } + // get format settings related to handling Referenced Object values private ROData _ROData; public ROData ROData { @@ -651,6 +660,7 @@ namespace VEPROMS.CSLA.Library return _ROData == null ? _ROData = new ROData(SelectSingleNode("ROData")) : _ROData; } } + // gets a list containing all of the defined step types and step parts (high level, sub-steps, cations, notes, etc) private StepDataList _StepDataList; public StepDataList StepDataList { @@ -919,6 +929,8 @@ namespace VEPROMS.CSLA.Library public class PDFPageSize : vlnFormatItem { public PDFPageSize(XmlNode xmlNode) : base(xmlNode) { } + + // Defines the printed page size (ex: US Letter, A4) private LazyLoad _PaperSize; public string PaperSize { @@ -1162,23 +1174,7 @@ namespace VEPROMS.CSLA.Library [TypeConverter(typeof(ExpandableObjectConverter))] public class EditData : vlnFormatItem { - public EditData(XmlNode xmlNode) : base(xmlNode) { } - private LazyLoad _EMode; - public E_EMode? EMode - { - get - { - return LazyLoad(ref _EMode, "@EMode"); - } - } - private LazyLoad _PromptForCautionType; - public bool PromptForCautionType - { - get - { - return LazyLoad(ref _PromptForCautionType, "@PromptForCautionType"); - } - } + public EditData(XmlNode xmlNode) : base(xmlNode) { } // Put in for Farley. This puts editor in editoral mode while a spell check being performed // - No change bars will be added // - existing change bars will remain @@ -1198,15 +1194,9 @@ namespace VEPROMS.CSLA.Library public class PrintData : vlnFormatItem { public PrintData(XmlNode xmlNode) : base(xmlNode) { } - private VersionIdTextList _VersionIdTextList; - public VersionIdTextList VersionIdTextList - { - get - { - return _VersionIdTextList == null? _VersionIdTextList = new VersionIdTextList(SelectNodes("VersionIdText/string")):_VersionIdTextList; - } - set { _VersionIdTextList = value; } - } + + // List of procedure descriptions (ProcDescr) inwhich we match the beginning of a procedure number + // in order to print procedure description text via a pagelist token private ProcDescrList _ProcDescrList; public ProcDescrList ProcDescrList { @@ -1215,14 +1205,9 @@ namespace VEPROMS.CSLA.Library return _ProcDescrList == null? _ProcDescrList = new ProcDescrList(SelectNodes("ProcDescrList/ProcDescr")):_ProcDescrList; } } - private LazyLoad _DoPrnDrvrAdjusts; - public int? DoPrnDrvrAdjusts - { - get - { - return LazyLoad(ref _DoPrnDrvrAdjusts, "@DoPrnDrvrAdjusts"); - } - } + + // an offset value for the placement of step tabs used in a Supplemental Information section of SAMG procedures + // to allow space for a Note or Caution tab. private LazyLoad _SupInfoTabOff; public int? SupInfoTabOff { @@ -1231,6 +1216,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SupInfoTabOff, "@SupInfoTabOff"); } } + + // Flag to determin if the parent tab is used as the first part of a supplemental info step/sub-step tab. private LazyLoad _SupInfoIncludeParTab; public bool SupInfoIncludeParTab { @@ -1239,6 +1226,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SupInfoIncludeParTab, "@SupInfoIncludeParTab"); } } + + // Shift the hoizontal positon of a step by 12 if the supplemental Info step tab was going to print over step text private LazyLoad _SupInfoAdjustXOffForLongTab; public bool SupInfoAdjustXOffForLongTab { @@ -1247,14 +1236,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SupInfoAdjustXOffForLongTab, "@SupInfoAdjustXOffForLongTab"); } } - private LazyLoad _TopOfPageThing; - public string TopOfPageThing - { - get - { - return LazyLoad(ref _TopOfPageThing, "@TopOfPageThing"); - } - } + + // flag to allow user to enter the procedure revision number, either a forward or back slash, + // then the revision date or revision text private LazyLoad _DoRevDate; public bool DoRevDate { @@ -1263,14 +1247,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _DoRevDate, "@DoRevDate"); } } - private LazyLoad _AlternateFoldoutPages; - public bool AlternateFoldoutPages - { - get - { - return LazyLoad(ref _AlternateFoldoutPages, "@AlternateFoldoutPages"); - } - } + + // Print alternate foldout pages within a defined range of procedure step pages. + // You can have multiple Foldout Page sections within a procedure, + // each pertaining to a range of steps (ranges cannot overlap) - used by Shearon Harris private LazyLoad _AlternateFloatingFoldout; public bool AlternateFloatingFoldout { @@ -1279,6 +1259,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AlternateFloatingFoldout, "@AlternateFloatingFoldout"); } } + + // Allows the user to identify a procedure section that is to be used as a foldout page + // that is printed on the backside of procedure step pages private LazyLoad _SectionLevelFoldouts; public bool SectionLevelFoldouts { @@ -1287,6 +1270,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SectionLevelFoldouts, "@SectionLevelFoldouts"); } } + + // This will replace any forward or back slash character they may be in the procedures's PDF file name + // with the character defined in the plant's format file private LazyLoad _SlashReplace; public string SlashReplace { @@ -1295,6 +1281,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SlashReplace, "@SlashReplace"); } } + + // Flag - (flag is named incorrectly) when set allows user to append to the procedure's revision number, + // a backslash character followed by a revision date private LazyLoad _RevDateWithForwardSlash; public bool RevDateWithForwardSlash { @@ -1303,6 +1292,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RevDateWithForwardSlash, "@RevDateWithForwardSlash"); } } + + // On the Working Draft Properties page, Turns on a text box for the user to enter in a unit number + // that is used on cover pages and in the page header - D.C. Cook and Calvert Cliffs formats private LazyLoad _UnitNumber; public bool UnitNumber { @@ -1311,6 +1303,12 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UnitNumber, "@UnitNumber"); } } + + // Flag allow for using the UnitProcSetString transition defintion variable which will build + // a prefix to the referenced procedure number + // ex: UnitProcSetString ="{PSI:UNITCOM}-{SI:SETNAME}-{PSI:SETID|4023}-" will look for UNITCOM in + // the Procedure Specific Information, then SETNAME in the Set Specific Information (working draft), + // then the SETID in the Procedure Specific Information (or use 4023) if nothing is entered private LazyLoad _OutSideTransSetName; //B2019-072: For AEP, use PSI & SI for outside transition text public bool OutSideTransSetName { @@ -1319,6 +1317,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _OutSideTransSetName, "@OutSideTransSetName"); } } + + // For Calvert Cliffs, this allows for double letted step tabs, speical handling in Transitions, + // special pagination logic for their style of procedures private LazyLoad _SpecialCaseCalvert; public bool SpecialCaseCalvert { @@ -1327,6 +1328,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpecialCaseCalvert, "@SpecialCaseCalvert"); } } + + // Calvert Alarms have the top part of the alarm point page in single column, the the bottom part in two column. + // Also special processing of Note, Cautions and Warnings private LazyLoad _SpecialCaseCalvertAlarm; public bool SpecialCaseCalvertAlarm { @@ -1335,6 +1339,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpecialCaseCalvertAlarm, "@SpecialCaseCalvertAlarm"); } } + + // Special pagination logic to handle out of the ordinary procedure formating and steps with RNOs + // that go on for pages private LazyLoad _SpecialCaseCalvertPagination; public bool SpecialCaseCalvertPagination { @@ -1343,7 +1350,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpecialCaseCalvertPagination, "@SpecialCaseCalvertPagination"); } } + // B2023-034 for use with Beaver Valley AOP format + // This allows for the use of the UseOnFirst docstyle setting on a mixture of sections and sub-sections private LazyLoad _UseOnFirstForSeparatePaginationOnSubSect; public bool UseOnFirstForSeparatePaginationOnSubSect { @@ -1352,7 +1361,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseOnFirstForSeparatePaginationOnSubSect, "@UseOnFirstForSeparatePaginationOnSubSect"); } } - // B2023-043 for use with Beaver Valley AOP format - allow attributes, such as superscript on section titles when printing + + // B2023-043 for use with Beaver Valley AOP format - allow attributes, such as superscript on section titles + // when printing private LazyLoad _SectionTitleWithAttributes; public bool SectionTitleWithAttributes { @@ -1361,6 +1372,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SectionTitleWithAttributes, "@SectionTitleWithAttributes"); } } + + // Format Flag enabling special formatting and printing of training materials - Wolf Creek Training format private LazyLoad _WCNTraining; public bool WCNTraining { @@ -1369,6 +1382,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _WCNTraining, "@WCNTraining"); } } + + // Only used in Calvert Cliffs Valve format - only supporting code checks to see + // if a note should be a footnote private LazyLoad _HorizontalSubsteps; public bool HorizontalSubsteps { @@ -1377,54 +1393,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _HorizontalSubsteps, "@HorizontalSubsteps"); } } - private LazyLoad _SpecialStepsFoldout; - public bool SpecialStepsFoldout - { - get - { - return LazyLoad(ref _SpecialStepsFoldout, "@SpecialStepsFoldout"); - } - } - private LazyLoad _SpecialStepsFoldoutKeepWhiteSpace; - public bool SpecialStepsFoldoutKeepWhiteSpace - { - get - { - return LazyLoad(ref _SpecialStepsFoldoutKeepWhiteSpace, "@SpecialStepsFoldoutKeepWhiteSpace"); - } - } - private LazyLoad _AllowDuplex; - public bool AllowDuplex - { - get - { - return LazyLoad(ref _AllowDuplex, "@AllowDuplex"); - } - } - private LazyLoad _AccessoryDocsInDuplex; - public bool AccessoryDocsInDuplex - { - get - { - return LazyLoad(ref _AccessoryDocsInDuplex, "@AccessoryDocsInDuplex"); - } - } - private LazyLoad _FoldoutsInDuplex; - public bool FoldoutsInDuplex - { - get - { - return LazyLoad(ref _FoldoutsInDuplex, "@FoldoutsInDuplex"); - } - } - private LazyLoad _PagelistChangeIDsWithCommas; - public bool PagelistChangeIDsWithCommas - { - get - { - return LazyLoad(ref _PagelistChangeIDsWithCommas, "@PagelistChangeIDsWithCommas"); - } - } + + // Doesn't reset the paglist for the first sub-section when printing + // - appears to be needed for plants with AP1000 procedures private LazyLoad _SpecialCaseWestinghouse; public bool SpecialCaseWestinghouse { @@ -1433,6 +1404,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpecialCaseWestinghouse, "@SpecialCaseWestinghouse"); } } + // Put in for Comanche Peak to print "COMMON" for the unit number instead of "Unit 0" private LazyLoad _PrintCommonForZeroUnit; public bool PrintCommonForZeroUnit @@ -1442,7 +1414,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PrintCommonForZeroUnit, "@PrintCommonForZeroUnit"); } } - private LazyLoad _NoBlankHlsAndFirstSub; // F2021-033: Barakah Alarm: no blank line between HLS & first substep + + // F2021-033: Barakah Alarm: no blank line between HLS & first substep + private LazyLoad _NoBlankHlsAndFirstSub; public bool NoBlankHlsAndFirstSub { get @@ -1450,7 +1424,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoBlankHlsAndFirstSub, "@NoBlankHlsAndFirstSub"); } } - private LazyLoad _NoBlankLastNoteCautionWarn; // F2021-025: Barakah Alarm: no blank line between last Note/Caution/Warn & box line + + // F2021-025: Barakah Alarm: no blank line between last Note/Caution/Warn & box line + private LazyLoad _NoBlankLastNoteCautionWarn; public bool NoBlankLastNoteCautionWarn { get @@ -1458,7 +1434,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoBlankLastNoteCautionWarn, "@NoBlankLastNoteCautionWarn"); } } - private LazyLoad _NoteCautionCenterOneAllTypes; // F2023-126: Vogtle Alarms - center single line caution/note if more than one type exist off step + + // F2023-126: Vogtle Alarms - center single line caution/note if more than one type exist off step + private LazyLoad _NoteCautionCenterOneAllTypes; public bool NoteCautionCenterOneAllTypes { get @@ -1466,7 +1444,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoteCautionCenterOneAllTypes, "@NoteCautionCenterOneAllTypes"); } } - private LazyLoad _ChkBoxToGeneratePointListText; // C2021-063 Barakah Alarm: check box to generate Alarm Point List Text + + // C2021-063 Barakah Alarm: check box to generate Alarm Point List Text + private LazyLoad _ChkBoxToGeneratePointListText; public bool ChkBoxToGeneratePointListText { get @@ -1474,7 +1454,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ChkBoxToGeneratePointListText, "@ChkBoxToGeneratePointListText"); } } - // C2022-004 When a procedure is approved, force the watermark of the unit number (defined in the format file under UnitWatermarkData) + + // C2022-004 When a procedure is approved, force the watermark of the unit number + // (defined in the format file under UnitWatermarkData) private LazyLoad _UseUnitWatermarkOnApproved; public bool UseUnitWatermarkOnApproved { @@ -1483,6 +1465,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseUnitWatermarkOnApproved, "@UseUnitWatermarkOnApproved"); } } + // B2022-086: Barakah - flag to adjust ypagesize for pagination when 1st and later pages have different printable box size private LazyLoad _AdjFirstSecDocStylesInPagination; public bool AdjFirstSecDocStylesInPagination @@ -1492,6 +1475,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AdjFirstSecDocStylesInPagination, "@AdjFirstSecDocStylesInPagination"); } } + + // Adjust the image size to better fit on the printed page private LazyLoad _AdjustLargeImage; public bool AdjustLargeImage { @@ -1501,46 +1486,15 @@ namespace VEPROMS.CSLA.Library } } } - #endregion - #region VersionIdText - [TypeConverter(typeof(ExpandableObjectConverter))] - public class VersionIdText : vlnFormatItem - { - public VersionIdText(XmlNode xmlNode) : base(xmlNode) { } - public VersionIdText() : base() { } - private LazyLoad _Text; - public string Text - { - get - { - return LazyLoad(ref _Text, "text()"); - } - } - public override string GetPDDisplayName() - { return "Text"; } - public override string GetPDDescription() - { return string.Format("VersionIdText '{0}'", Text); } - public override string GetPDCategory() - { return "Version Id Text"; } - public override string ToString() - { - return Text; - } - } - #endregion - #region VersionIdTextList - [TypeConverter(typeof(vlnListConverter))] - public class VersionIdTextList : vlnFormatList - { - public VersionIdTextList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } - } - #endregion + #endregion PrintData #region ProcDescr [TypeConverter(typeof(ExpandableObjectConverter))] public partial class ProcDescr : vlnFormatItem //: BusinessBase, IDisposable { public ProcDescr(XmlNode xmlNode) : base(xmlNode) { } public ProcDescr() : base() { } + + // procedure number part (pattern) to match to find a description to use with the {PROCDESC} pagelist token private LazyLoad _MatchProcNumber; public string MatchProcNumber { @@ -1549,6 +1503,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _MatchProcNumber, "@MatchProcNumber"); } } + + // The description text associated with a MatchProcNumber Text is used to replace the {PROCDES1} pagelist private LazyLoad _ProcDescr1; public string ProcDescr1 { @@ -1557,6 +1513,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ProcDescr1, "@ProcDescr1"); } } + + // A second description text associated with a MatchProcNumber. Text is used to replace the {PROCDES2} private LazyLoad _ProcDescr2; public string ProcDescr2 { @@ -1576,24 +1534,15 @@ namespace VEPROMS.CSLA.Library { public ProcDescrList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } } - #endregion - #endregion - #endregion + #endregion ProcDescrList + #endregion ProcDescr + #endregion PrintDataAll #region ProcDataAll #region ProcData [TypeConverter(typeof(ExpandableObjectConverter))] public class ProcData : vlnFormatItem { public ProcData(XmlNode xmlNode) : base(xmlNode) { } - private ProcedureSuffixList _ProcedureSuffixList; - public ProcedureSuffixList ProcedureSuffixList - { - get - { - return _ProcedureSuffixList == null ? _ProcedureSuffixList = new ProcedureSuffixList(SelectNodes("ProcedureSuffix/string")) : _ProcedureSuffixList; - } - set { _ProcedureSuffixList = value; } - } private ChangeBarData _ChangeBarData; public ChangeBarData ChangeBarData { @@ -1637,6 +1586,9 @@ namespace VEPROMS.CSLA.Library return localvalue ?? LazyLoad(ref _CheckOffUCF, "@CheckOffUCF"); } } + + // specifies the maxiumn length of the procedure title before PROMS considers to wrap the title + // this is used with the {PROCTITLE} PageStyle toekn private LazyLoad _TitleLength; public int? TitleLength { @@ -1645,6 +1597,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TitleLength, "@TitleLength"); } } + + // Length of the procedure title before wrapping on the Cover Page. T + // his is used with the {COVERPROCTITLE} PageSytle token private LazyLoad _CoverTitleLength; public int? CoverTitleLength { @@ -1653,14 +1608,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CoverTitleLength, "@CoverTitleLength"); } } - private LazyLoad _ProcedureSuffixFlags; - public string ProcedureSuffixFlags - { - get - { - return LazyLoad(ref _ProcedureSuffixFlags, "@ProcedureSuffixFlags"); - } - } + + // Uppercase the procedure title when printed private LazyLoad _CapitalizeTitle; public bool CapitalizeTitle { @@ -1669,14 +1618,11 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CapitalizeTitle, "@CapitalizeTitle"); } } - private LazyLoad _ChangeStyleForEverySection; - public bool ChangeStyleForEverySection - { - get - { - return LazyLoad(ref _ChangeStyleForEverySection, "@ChangeStyleForEverySection"); - } - } + + // If a procedure or section does not have a title PROMS puts in "" as default title text + // by default (base format) PROMS will print "" + // When set to False, this flag prevents PROMS printing the text "" + // This also affects transiton references private LazyLoad _PrintNoTitle; public bool PrintNoTitle { @@ -1685,6 +1631,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PrintNoTitle, "@PrintNoTitle"); } } + + // This will print Notes at the bottom of the page as footnotes + // Use by Calvert Cliffs (BGE) primarily for their landscaped valve sections private LazyLoad _NotesToFootnotes; public bool NotesToFootnotes { @@ -1693,77 +1642,30 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NotesToFootnotes, "@NotesToFootnotes"); } } + + // C2021-027: Procedure level PC/PC + // This allows us to assign an entire procedure's applicability level + // instead of just the sections and steps private LazyLoad _ProcAppl; - public bool ProcAppl // C2021-027: Procedure level PC/PC + public bool ProcAppl { get { return LazyLoad(ref _ProcAppl, "@ProcAppl"); } } - private LazyLoad _CountFoldoutPages; - public bool CountFoldoutPages - { - get - { - return LazyLoad(ref _CountFoldoutPages, "@CountFoldoutPages"); - } - } - private LazyLoad _ForeColor; - public string ForeColor - { - get - { - return LazyLoad(ref _ForeColor, "@ForeColor"); - } - } - private LazyLoad _BackColor; - public string BackColor - { - get - { - return LazyLoad(ref _BackColor, "@BackColor"); - } - } - } - #endregion - #region ProcedureSuffix - [TypeConverter(typeof(ExpandableObjectConverter))] - public class ProcedureSuffix : vlnFormatItem - { - public ProcedureSuffix(XmlNode xmlNode) : base(xmlNode) { } - public ProcedureSuffix() : base() { } - private LazyLoad _Text; - public string Text - { - get - { - return LazyLoad(ref _Text, "text()"); - } - } - public override string GetPDDisplayName() - { return "Text"; } - public override string GetPDDescription() - { return string.Format("ProcedureSuffix '{0}'", Text); } - public override string GetPDCategory() - { return "Procedure Suffix"; } - public override string ToString() - { - return Text; - } - } - #endregion - #region ProcedureSuffixList - [TypeConverter(typeof(vlnListConverter))] - public class ProcedureSuffixList : vlnFormatList - { - public ProcedureSuffixList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } } + #endregion #region PsiAll [TypeConverter(typeof(ExpandableObjectConverter))] public class PSI : vlnFormatItem { + // Procedure Specific Information (context menu from a procedure in the tree view) + // Will create a window based on the settings in the plant's format file + // Allows for procedure specific information that is printed via the format file's + // PageList structure. Used for procedure specific text in page headers + // and cover pages (i.e. signaure names, dates, Use Categories) public PSI(XmlNode xmlNode) : base(xmlNode) { } private LazyLoad _x; public int? x @@ -1782,6 +1684,7 @@ namespace VEPROMS.CSLA.Library } } private LazyLoad _Caption; + // caption for the PSI window public string Caption { get @@ -1790,6 +1693,7 @@ namespace VEPROMS.CSLA.Library } } private LazyLoad _ButtonsOnBottom; // change to bool + // place the OK and Cancel buttons on the bottom of the PSI window public string ButtonsOnBottom { get @@ -1797,6 +1701,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ButtonsOnBottom, "@ButtonsOnBottom"); } } + // returns a list of labels that are defined in the format's PSI structure private SILabels _LabelList; public SILabels LabelList { @@ -1805,6 +1710,7 @@ namespace VEPROMS.CSLA.Library return _LabelList == null ? _LabelList = new SILabels(SelectNodes("/PlantFormat/FormatData/ProcData/PSI/Label")) : _LabelList; } } + // returns a list of fields that are defined in the format's PSI structure private SIFields _FieldList; public SIFields FieldList { @@ -1819,6 +1725,7 @@ namespace VEPROMS.CSLA.Library public SILabels(XmlNodeList xmlNodeList) : base(xmlNodeList) { } } + // PSI label class public class SILabel : vlnFormatItem { public SILabel(XmlNode xmlNode) : base(xmlNode) { } @@ -1876,6 +1783,7 @@ namespace VEPROMS.CSLA.Library { public SIFields(XmlNodeList xmlNodeList) : base(xmlNodeList) { } } + // PSI field class public class SIField : vlnFormatItem { public SIField(XmlNode xmlNode) : base(xmlNode) { } @@ -1955,6 +1863,8 @@ namespace VEPROMS.CSLA.Library } #endregion #region SIAll + // classes to handle Set Specific information + // Same as PSI but accessable only from the Working draft tree node [TypeConverter(typeof(ExpandableObjectConverter))] public class SI : vlnFormatItem { @@ -1975,6 +1885,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _y, "@y"); } } + // caption for the the Set Specific information window private LazyLoad _Caption; public string Caption { @@ -1983,6 +1894,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Caption, "@Caption"); } } + // the the OK and Cancel buttons on the bottom of the SI Window private LazyLoad _ButtonsOnBottom; // change to bool public string ButtonsOnBottom { @@ -2155,6 +2067,9 @@ namespace VEPROMS.CSLA.Library if (retlist2 != null && retlist2.Count > 0) foreach (CheckOffHeader co in retlist2) retlist.Add(co); _CheckOffHeaderList = retlist; } + + // This is used with the {INITIALS} pagelist token and will put the word "INITIALS" at the specified pagelist + // location for the checkoff column header. Used by Calvert Cliffs (BGEOI and BGESTP formats) private LazyLoad _CheckOffHeaderInPagelist; public bool CheckOffHeaderInPagelist { @@ -2163,6 +2078,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CheckOffHeaderInPagelist, "@CheckOffHeaderInPagelist"); } } + // Menu heading for checkoffs/signoffs. When this is set to "Signoff", the checkoff list is not enabled private LazyLoad _Menu; public string Menu { @@ -2171,30 +2087,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Menu, "@Menu"); } } - private LazyLoad _AllowSectEdit; - public bool AllowSectEdit - { - get - { - return LazyLoad(ref _AllowSectEdit, "@AllowSectEdit"); - } - } - private LazyLoad _AllowStepEdit; - public bool AllowStepEdit - { - get - { - return LazyLoad(ref _AllowStepEdit, "@AllowStepEdit"); - } - } - private LazyLoad _UseCheckOffsIn; - public int? UseCheckOffsIn - { - get - { - return LazyLoad(ref _UseCheckOffsIn, "@UseCheckOffsIn"); - } - } + + // this will make room on the page for checkoffs by adjusting the step text width. Used for cases where there isn't + // a checkoff header (we adjust step text width when a checkoff header is printed) private LazyLoad _CheckOffAdjustment; public float? CheckOffAdjustment { @@ -2203,6 +2098,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CheckOffAdjustment, "@CheckOffAdjustment"); } } + // used for checkoff (initial line) next to the step number tab. the XLocation number is added to the left margin private LazyLoad _XLocation; public float? XLocation { @@ -2211,6 +2107,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _XLocation, "@XLocation"); } } + + // relative location of the checkoff based on the text width and its location on the page private LazyLoad _RelXLocation; public float? RelXLocation { @@ -2219,7 +2117,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RelXLocation, "@RelXLocation"); } } - + + //Start printing the checkoff on the last line of the step text (when set here applies to all checkofs) private LazyLoad _DropCheckOff; public bool DropCheckOff { @@ -2228,6 +2127,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _DropCheckOff, "@DropCheckOff"); } } + + // put checkoff only on High Level Steps private LazyLoad _CheckOffOnHLSOnly; public bool CheckOffOnHLSOnly { @@ -2236,6 +2137,11 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CheckOffOnHLSOnly, "@CheckOffOnHLSOnly"); } } + + // SkipSpaces puts the checkoff macro (if specified in the format) next to the step tab + // the print logic looks at the step tab and skips (backwards) the lenth (width) of the tab + // to position the checkoff + // - this is used for Bryon and Braidwood private LazyLoad _SkipSpaces; public bool SkipSpaces { @@ -2244,7 +2150,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SkipSpaces, "@SkipSpaces"); } } + // put in for Bryon and Braidwood + // enables the selection of a checkoff only when on a sub-step type private LazyLoad _CheckoffOnSubStepsOnly; public bool CheckoffOnSubStepsOnly { @@ -2253,6 +2161,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CheckoffOnSubStepsOnly, "@CheckoffOnSubStepsOnly"); } } + // C2019-040 This will adjust the right margin (making room for the checkoff) without the need of selecting a checkoff header // the flag allows us to use existing coding that prior to this was restricted by format file name private LazyLoad _CheckoffsWithoutHeader; @@ -2279,7 +2188,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Index, "@Index"); } } - private LazyLoad _OrderBy; // C2020-003 used to sort list of checkoffs in the combo box + // C2020-003 used to sort list of checkoffs in the combo box + // a foat number can be used (ex 2.75) to fine tune the sorting + private LazyLoad _OrderBy; public float? OrderBy { get @@ -2287,6 +2198,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _OrderBy, "@OrderBy"); } } + // User Interface Mark (UIMark) is the deimal number of an ASCII character that is desplayed in the step editor + // to indicate the selected checkoff private LazyLoad _UIMark; public int? UIMark { @@ -2295,14 +2208,11 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UIMark, "@UIMark"); } } - private LazyLoad _CheckOffWidAdjust; - public float? CheckOffWidAdjust - { - get - { - return LazyLoad(ref _CheckOffWidAdjust, "@CheckOffWidAdjust"); - } - } + + // If a positive numer, start the checkoff that number of lines minus one down from the start of the text + // and add that many lines after. + // If it's negative number, start the checkoff on the same line as the text + // and add positive of that number of lines after the checkoff macro. (see vlnPaaragraph.cs) private LazyLoad _CheckOffXtraLines; public float? CheckOffXtraLines { @@ -2311,6 +2221,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CheckOffXtraLines, "@CheckOffXtraLines"); } } + + // Add blank lines to make room for loner signoffs (checkoffs) private LazyLoad _CheckOffNumberOfLines; public float? CheckOffNumberOfLines { @@ -2319,6 +2231,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CheckOffNumberOfLines, "@CheckOffNumberOfLines"); } } + + //Descriptive text shown in the checkoff selection list private LazyLoad _MenuItem; public string MenuItem { @@ -2327,6 +2241,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _MenuItem, "@MenuItem"); } } + + // Name of the macro defined in the correspoinding SVG (GenMac) file. + // The print logic uese this macro to draw the checkoff private LazyLoad _Macro; public string Macro { @@ -2335,6 +2252,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Macro, "@Macro"); } } + + //Don’t' print the checkoff if the step text is empty (all spaces or hardspaces) private LazyLoad _NotOnEmpty; public bool NotOnEmpty { @@ -2343,6 +2262,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NotOnEmpty, "@NotOnEmpty"); } } + + // Start printing the checkoff on the last line of the step text (applies to just this checkoff) private LazyLoad _DropCheckOff; public bool DropCheckOff { @@ -2384,6 +2305,7 @@ namespace VEPROMS.CSLA.Library [TypeConverter(typeof(ExpandableObjectConverter))] public class CheckOffHeader : vlnFormatItem,IVlnIndexedFormatItem { + // Column header for the printed checkoff column public CheckOffHeader(XmlNode xmlNode) : base(xmlNode) { } public CheckOffHeader() : base() { } private LazyLoad _Index; @@ -2402,6 +2324,8 @@ namespace VEPROMS.CSLA.Library return (_Font == null ? _Font = new VE_Font(base.XmlNode) : _Font); } } + + // the checkoff column heading text (when printed) private LazyLoad _CheckOffHeading; public string CheckOffHeading { @@ -2445,6 +2369,11 @@ namespace VEPROMS.CSLA.Library public class ChangeBarData : vlnFormatItem { public ChangeBarData(XmlNode xmlNode) : base(xmlNode) { } + // Comma separated list of column positions for each of the change bar types: + // With Text + // Outside Box + // AER on LEFT, RNO on Right + // To the Left of Text private LazyLoad _DefaultCBLoc; public string DefaultCBLoc { @@ -2453,62 +2382,45 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _DefaultCBLoc, "@DefaultCBLoc"); } } + // text that is place next to the change bar + // DateChgID (Date and Change ID) + // RevNum (Revision Number) + // ChgID (Change ID) + // None (No Change Bar Message) + // UserDef (User Defined Message) private LazyLoad _ChangeBarMessage; public string ChangeBarMessage - { - get - { - return LazyLoad(ref _ChangeBarMessage, "@ChangeBarMessage"); - } + { + get + { + return LazyLoad(ref _ChangeBarMessage, "@ChangeBarMessage"); + } } + // FixedChangeColumn + - Column location for change bars + // 0 - Separate AER and RNO change bars to the right of the text + // -10 to -1 - Change bars on left (specify # of columns from the text) + // <-10 - AER change bars on the left and RNO change bars on the right. private LazyLoad _FixedChangeColumn; public int? FixedChangeColumn - { - get - { + { + get + { return LazyLoad(ref _FixedChangeColumn, "@FixedChangeColumn"); - } + } } + // specific location of change bars for text in AER column + // - appears to be used when FixedChageColumn is set to a number <-10 private LazyLoad _FixedAERChangeColumn; public int? FixedAERChangeColumn - { - get - { - return LazyLoad(ref _FixedAERChangeColumn, "@FixedAERChangeColumn"); - } - } - private LazyLoad _ChangeSummaryStyle; - public E_Style? ChangeSummaryStyle { get { - return LazyLoad(ref _ChangeSummaryStyle, "@ChangeSummaryStyle"); - } - } - private LazyLoad _ChangeBarStyle; - public E_Style? ChangeBarStyle - { - get - { - return LazyLoad(ref _ChangeBarStyle, "@ChangeBarStyle"); - } - } - private LazyLoad _SpecialChangeBar; - public string SpecialChangeBar - { - get - { - return LazyLoad(ref _SpecialChangeBar, "@SpecialChangeBar"); - } - } - private LazyLoad _CondensedChangeBar; - public bool CondensedChangeBar - { - get - { - return LazyLoad(ref _CondensedChangeBar, "@CondensedChangeBar"); + return LazyLoad(ref _FixedAERChangeColumn, "@FixedAERChangeColumn"); } } + + // if the format has the absolutefixedchangecolumn format flag, then always use the fixedchangecolumn from the + // format, otherwise, use the default column based on the selected location, stored in the base format. private LazyLoad _AbsoluteFixedChangeColumn; public bool AbsoluteFixedChangeColumn { @@ -2517,6 +2429,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AbsoluteFixedChangeColumn, "@AbsoluteFixedChangeColumn"); } } + + // Continue the change bar through the blank lines for consectutive changed steps private LazyLoad _ContinuousChangeBars; public bool ContinuousChangeBars { @@ -2525,14 +2439,12 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ContinuousChangeBars, "@ContinuousChangeBars"); } } - private LazyLoad _ChgBarMessageFromEdit; - public bool ChgBarMessageFromEdit - { - get - { - return LazyLoad(ref _ChgBarMessageFromEdit, "@ChgBarMessageFromEdit"); - } - } + + // will allow user to type in a change ID text to be placed next to the the change bar for the piece of changed text + // user is prompted to enter a change ID when opening a procedure. + // A Change ID tab i placed on the procedure editor ribbon to allow the user to modify the change id entered + // upon opening the procedure + // an option on the step properties pannel allows user to modify the change id text for that piece of changed text. private LazyLoad _ChangeIds; public bool ChangeIds { @@ -2541,6 +2453,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ChangeIds, "@ChangeIds"); } } + // extend the change bar that is on the last RNO step down to the RNO separator + // (only a couple plants and a RNO separator) private LazyLoad _ChangeBarToRNOSep; public bool ChangeBarToRNOSep { @@ -2549,14 +2463,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ChangeBarToRNOSep, "@ChangeBarToRNOSep"); } } - private LazyLoad _ChangeBarsOnLinkedText; - public bool ChangeBarsOnLinkedText - { - get - { - return LazyLoad(ref _ChangeBarsOnLinkedText, "@ChangeBarsOnLinkedText"); - } - } + + // don't do one continuous change bar when there are multiple Notes or Caution types next to each other private LazyLoad _SeparateChangeBarsForDiffNotesCautions; public bool SeparateChangeBarsForDiffNotesCautions { @@ -2574,6 +2482,8 @@ namespace VEPROMS.CSLA.Library public class SectData : vlnFormatItem { public SectData(XmlNode xmlNode) : base(xmlNode) { } + // contains settings for when(if) the procedure's section number is printed on the page (controled by checkbox + // on section property page) private SectionNumber _SectionNumber; public SectionNumber SectionNumber { @@ -2583,6 +2493,8 @@ namespace VEPROMS.CSLA.Library return _SectionNumber; } } + // contains setting for when (if) the procedure's section title (section header) is printed (controled by checkbox + // on section property page) private SectionHeader _SectionHeader; public SectionHeader SectionHeader { @@ -2592,6 +2504,8 @@ namespace VEPROMS.CSLA.Library return _SectionHeader; } } + + // this contains a start position and length of a line that will be drawn at the end of a section - WCNTRN private SectionHeaderSeparatorLine _SectionHeaderSeparatorLine; public SectionHeaderSeparatorLine SectionHeaderSeparatorLine { @@ -2601,6 +2515,8 @@ namespace VEPROMS.CSLA.Library return _SectionHeaderSeparatorLine; } } + + // contains settings pertaining to the PROMS Step Sections (non-Word sections) private StepSectionData _StepSectionData; public StepSectionData StepSectionData { @@ -2610,6 +2526,8 @@ namespace VEPROMS.CSLA.Library return _StepSectionData; } } + + // contains settings pertaining to Word Editor section types private AccSectionData _AccSectionData; public AccSectionData AccSectionData { @@ -2624,7 +2542,7 @@ namespace VEPROMS.CSLA.Library { get { - if (_MetaSectionList == null) _MetaSectionList = new MetaSectionList(SelectNodes("MetaSectionData/MetaSection"),MyFormat); + if (_MetaSectionList == null) _MetaSectionList = new MetaSectionList(SelectNodes("MetaSectionData/MetaSection"), MyFormat); return _MetaSectionList; } set { _MetaSectionList = value; } @@ -2643,18 +2561,23 @@ namespace VEPROMS.CSLA.Library { get { - return (_ReplaceSymbolCharList == null) ? _ReplaceSymbolCharList = new ReplaceSymbolCharList(SelectNodes("ReplaceSymbolChars/ReplaceChar"),MyFormat) : _ReplaceSymbolCharList; + return (_ReplaceSymbolCharList == null) ? _ReplaceSymbolCharList = new ReplaceSymbolCharList(SelectNodes("ReplaceSymbolChars/ReplaceChar"), MyFormat) : _ReplaceSymbolCharList; } set { _ReplaceSymbolCharList = value; } } + // The maxium length of section titles before PROMS will split it onto another line + // - used when section titles are printed via pagelist private LazyLoad _SectionTitleLength; public int? SectionTitleLength - { - get - { - return LazyLoad(ref _SectionTitleLength, "@SectionTitleLength"); - } + { + get + { + return LazyLoad(ref _SectionTitleLength, "@SectionTitleLength"); + } } + + // The maxium length of the section number plus the section title before PROMS will split it onto another line + // - used when section number and title are printed on the same line via pagelist private LazyLoad _SectionNumberAndTitleLength; public int? SectionNumberAndTitleLength { @@ -2663,6 +2586,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SectionNumberAndTitleLength, "@SectionNumberAndTitleLength"); } } + + // The maxium length of the section number plus the section title before PROMS will split it onto another line + // - used when section number and title are printed on the same line via pagelist + // - used for landscaped sections private LazyLoad _SectNumAndTlLenLand; // B2021-119: large titles on Landscape Word Attachments are printing on 2 lines. public int? SectNumAndTlLenLand { @@ -2671,38 +2598,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SectNumAndTlLenLand, "@SectNumAndTlLenLand"); } } - private LazyLoad _ForeColor; - public string ForeColor - { - get - { - return LazyLoad(ref _ForeColor, "@ForeColor"); - } - } - private LazyLoad _BackColor; - public string BackColor - { - get - { - return LazyLoad(ref _BackColor, "@BackColor"); - } - } - private LazyLoad _MetaSectEndMessage; - public bool MetaSectEndMessage - { - get - { - return LazyLoad(ref _MetaSectEndMessage, "@MetaSectEndMessage"); - } - } - private LazyLoad _ReadOnlyTypeInContMsg; - public bool ReadOnlyTypeInContMsg - { - get - { - return LazyLoad(ref _ReadOnlyTypeInContMsg, "@ReadOnlyTypeInContMsg"); - } - } + + // flag to determine if the ReplaceWords logic will be run on non-Setpoint RO values private LazyLoad _ReplaceWordsInROs; public bool ReplaceWordsInROs { @@ -2721,6 +2618,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoReplaceQuoteParenWords, "@NoReplaceQuoteParenWords"); } } + + // When set to true, turns on the option to add sub-sections to non-Word sections private LazyLoad _UseMetaSections; public bool UseMetaSections { @@ -2729,6 +2628,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseMetaSections, "@UseMetaSections"); } } + + // when printing count the sub-section level towards the step level + // - works only when the TieTabToLevel format flag is also true private LazyLoad _CountSubSectionsForLevel; public bool CountSubSectionsForLevel { @@ -2737,6 +2639,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CountSubSectionsForLevel, "@CountSubSectionsForLevel"); } } + + // prints a list of phone numbers at the bottom of the page + // - Calvert Cliffs private LazyLoad _PrintPhoneList; public bool PrintPhoneList { @@ -2745,6 +2650,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PrintPhoneList, "@PrintPhoneList"); } } + + // Set the default to NO for the automatic Indent of sub sections (this a a check box on the section properties page) private LazyLoad _DefaultNoSubAutoIndent; public bool DefaultNoSubAutoIndent { @@ -2753,30 +2660,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _DefaultNoSubAutoIndent, "@DefaultNoSubAutoIndent"); } } - private LazyLoad _NonEditableSteps; - public bool NonEditableSteps - { - get - { - return LazyLoad(ref _NonEditableSteps, "@NonEditableSteps"); - } - } - private LazyLoad _SearchAllReplaceWords; - public bool SearchAllReplaceWords - { - get - { - return LazyLoad(ref _SearchAllReplaceWords, "@SearchAllReplaceWords"); - } - } - private LazyLoad _SecTitleContinue; - public bool SecTitleContinue - { - get - { - return LazyLoad(ref _SecTitleContinue, "@SecTitleContinue"); - } - } + + // convert the caret (^) to he delta symbol in Referenced Objects (RO) return values private LazyLoad _ConvertCaretToDelta; public bool ConvertCaretToDelta { @@ -2785,6 +2670,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ConvertCaretToDelta, "@ConvertCaretToDelta"); } } + //B2019-037 throw back from DOS VE-PROMS, convert "~" to subscript and "#" to superscript in RO return values private LazyLoad _UseTildaPoundCharsForSuperSubScriptInROValues; public bool UseTildaPoundCharsForSuperSubScriptInROValues @@ -2794,7 +2680,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseTildaPoundCharsForSuperSubScriptInROValues, "@UseTildaPoundCharsForSuperSubScriptInROValues"); } } - // C2022-021 will convert ">=" to the greater than or equal symbol, "<=" to the less than or equal symbol and plus/minus for RO return values + + // C2022-021 will convert ">=" to the greater than or equal symbol, "<=" to the less than or equal symbol and "+-" to plus/minus symbol for RO return values private LazyLoad _ConvertGTELTEPMinROValue; public bool ConvertGTELTEPMinROValue { @@ -2803,7 +2690,12 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ConvertGTELTEPMinROValue, "@ConvertGTELTEPMinROValue"); } } - // C2019-043 will convert "->" to the right arrow symbol and "<-" to the left arrow symbol for RO return values + + // C2019-043 will convert "->" to the right arrow symbol and "<-" to the left arrow symbol + // for RO return values. + // was put in Barakah (BNPP) but found issue when RO was in a PROMS table cell, + // logic was added to no do this convert if in a table. + // BNPP decided to turned it off in altogether in their format files. private LazyLoad _UseDashGreaterLessThenForArrowsInROValue; public bool UseDashGreaterLessThenForArrowsInROValue { @@ -2812,6 +2704,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseDashGreaterLessThenForArrowsInROValue, "@UseDashGreaterLessThenForArrowsInROValue"); } } + + // Use only for RO return values placed in Word sections, the underbar character '_' + // will toggle underlining ON/OFF in the RO return value text private LazyLoad _ConvertUnderscoreToUnderline; public bool ConvertUnderscoreToUnderline { @@ -2821,6 +2716,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ConvertUnderscoreToUnderline, "@ConvertUnderscoreToUnderline"); } } + // This format flag turns off the Replace Words functionality. // in 16-bit proms, this was done simply by having an empty Replace Words list. // in 32-bit the inheiradence logic finds a replace words list in the base format @@ -2833,6 +2729,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TurnOffReplaceWords, "@TurnOffReplaceWords"); } } + // B2022-002: Section text is printing into the INITIAL column (BNPP1new) private LazyLoad _AdjWidthForCheckOff; public bool AdjWidthForCheckOff @@ -2850,22 +2747,27 @@ namespace VEPROMS.CSLA.Library { public SectionNumber(XmlNode xmlNode) : base(xmlNode) { } public SectionNumber() : base() { } + + // starting position from the left margin inwhich to place the section number private LazyLoad _Pos; public float? Pos - { - get - { - return LazyLoad(ref _Pos, "@Pos"); - } + { + get + { + return LazyLoad(ref _Pos, "@Pos"); + } } + // Left (PSLeft), Center (PSCenter) + // justification of the text for the starting position (Pos) private LazyLoad _Just; public string Just - { - get + { + get { return LazyLoad(ref _Just, "@Just"); - } + } } + // only for a first level section, print using a font size of 14 and sytle of bold private LazyLoad _Level0Big; public bool Level0Big { @@ -2890,6 +2792,8 @@ namespace VEPROMS.CSLA.Library { public SectionHeader(XmlNode xmlNode) : base(xmlNode) { } public SectionHeader() : base() { } + + // starting position from the left margin inwhich to place the section number private LazyLoad _Pos; public float? Pos { @@ -2898,6 +2802,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Pos, "@Pos"); } } + // Left (PSLeft), Center (PSCenter) + // justification of the text for the starting position (Pos) private LazyLoad _Just; public string Just { @@ -2906,6 +2812,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Just, "@Just"); } } + // only for a first level section, print using a font size of 14 and sytle of bold private LazyLoad _Level0Big; public bool Level0Big { @@ -2914,6 +2821,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Level0Big, "@Level0Big"); } } + // Turn off underlining of section title for sub-sections private LazyLoad _OnlyUnderlineTopSect; public bool OnlyUnderlineTopSect { @@ -2922,6 +2830,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _OnlyUnderlineTopSect, "@OnlyUnderlineTopSect"); } } + //Turn off bolding of section title for sub-sections private LazyLoad _OnlyBoldTopSect; public bool OnlyBoldTopSect { @@ -2955,6 +2864,8 @@ namespace VEPROMS.CSLA.Library { public SectionHeaderSeparatorLine(XmlNode xmlNode) : base(xmlNode) { } public SectionHeaderSeparatorLine() : base() { } + + // starting position, from the left margin, of the sparator line private LazyLoad _XStartPos; public float? XStartPos { @@ -2963,6 +2874,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _XStartPos, "@XStartPos"); } } + // Length of the spearator line private LazyLoad _Length; public float? Length { @@ -2985,7 +2897,7 @@ namespace VEPROMS.CSLA.Library { get { - return (_TextTypeValueList == null)? _TextTypeValueList = new TextTypeValueList(SelectNodes("TextTypeValue/short")): _TextTypeValueList; + return (_TextTypeValueList == null) ? _TextTypeValueList = new TextTypeValueList(SelectNodes("TextTypeValue/short")) : _TextTypeValueList; } set { _TextTypeValueList = value; } } @@ -2994,61 +2906,16 @@ namespace VEPROMS.CSLA.Library { get { - return (_TextTypeList == null)? _TextTypeList = new TextTypeList(SelectNodes("TextType/string")): _TextTypeList; + return (_TextTypeList == null) ? _TextTypeList = new TextTypeList(SelectNodes("TextType/string")) : _TextTypeList; } set { _TextTypeList = value; } } - //private SeqTabList _SeqTabList; - //public SeqTabList SeqTabList - //{ - // get - // { - // return (_SeqTabList == null)? _SeqTabList = new SeqTabList(SelectNodes("SeqTab/string")): _SeqTabList; - // } - // set { _SeqTabList = value; } - //} - //private PreSeqTabEditList _PreSeqTabEditList; - //public PreSeqTabEditList PreSeqTabEditList - //{ - // get - // { - // return (_PreSeqTabEditList == null) ?_PreSeqTabEditList = new PreSeqTabEditList(SelectNodes("PreSeqTabEdit/string")): _PreSeqTabEditList; - // } - // set { _PreSeqTabEditList = value; } - //} - //private PreSeqTabPrintList _PreSeqTabPrintList; - //public PreSeqTabPrintList PreSeqTabPrintList - //{ - // get - // { - // return (_PreSeqTabPrintList == null)? _PreSeqTabPrintList = new PreSeqTabPrintList(SelectNodes("PreSeqTabPrint/string")):_PreSeqTabPrintList; - // } - // set { _PreSeqTabPrintList = value; } - //} - //private PostSeqTabEditList _PostSeqTabEditList; - //public PostSeqTabEditList PostSeqTabEditList - //{ - // get - // { - // return (_PostSeqTabEditList == null)? _PostSeqTabEditList = new PostSeqTabEditList(SelectNodes("PostSeqTabEdit/string")): _PostSeqTabEditList; - // } - // set { _PostSeqTabEditList = value; } - //} - //private PostSeqTabPrintList _PostSeqTabPrintList; - //public PostSeqTabPrintList PostSeqTabPrintList - //{ - // get - // { - // return (_PostSeqTabPrintList == null)? _PostSeqTabPrintList = new PostSeqTabPrintList(SelectNodes("PostSeqTabPrint/string")): _PostSeqTabPrintList; - // } - // set { _PostSeqTabPrintList = value; } - //} private UnderlineTerminateList _UnderlineTerminateList; public UnderlineTerminateList UnderlineTerminateList { get { - return (_UnderlineTerminateList == null)? _UnderlineTerminateList = new UnderlineTerminateList(SelectNodes("UnderlineTerminate/string")):_UnderlineTerminateList; + return (_UnderlineTerminateList == null) ? _UnderlineTerminateList = new UnderlineTerminateList(SelectNodes("UnderlineTerminate/string")) : _UnderlineTerminateList; } set { _UnderlineTerminateList = value; } } @@ -3057,7 +2924,7 @@ namespace VEPROMS.CSLA.Library { get { - return (_ObserveNCString1List == null)? _ObserveNCString1List = new ObserveNCString1List(SelectNodes("ObserveNCString1/string")): _ObserveNCString1List; + return (_ObserveNCString1List == null) ? _ObserveNCString1List = new ObserveNCString1List(SelectNodes("ObserveNCString1/string")) : _ObserveNCString1List; } set { _ObserveNCString1List = value; } } @@ -3066,7 +2933,7 @@ namespace VEPROMS.CSLA.Library { get { - return (_ObserveNCString2List == null)? _ObserveNCString2List = new ObserveNCString2List(SelectNodes("ObserveNCString2/string")):_ObserveNCString2List; + return (_ObserveNCString2List == null) ? _ObserveNCString2List = new ObserveNCString2List(SelectNodes("ObserveNCString2/string")) : _ObserveNCString2List; } set { _ObserveNCString2List = value; } } @@ -3075,23 +2942,17 @@ namespace VEPROMS.CSLA.Library { get { - return (_StepSectionLayoutData == null)? _StepSectionLayoutData = new StepSectionLayoutData(SelectSingleNode("StpSectLayData")):_StepSectionLayoutData; - } - } - private StepSectionEditData _StepSectionEditData; - public StepSectionEditData StepSectionEditData - { - get - { - return (_StepSectionEditData == null)? _StepSectionEditData = new StepSectionEditData(SelectSingleNode("StpSectEditData")): _StepSectionEditData; + return (_StepSectionLayoutData == null) ? _StepSectionLayoutData = new StepSectionLayoutData(SelectSingleNode("StpSectLayData")) : _StepSectionLayoutData; } } + + // a list of the sequential tab formatting based on the level of the step/sub-step private SeqTabFmtList _SeqTabFmtList; public SeqTabFmtList SeqTabFmtList { get { - return (_SeqTabFmtList == null) ? _SeqTabFmtList = new SeqTabFmtList(SelectNodes("SequentialTabFormat/SeqTabFmt"),MyFormat) : _SeqTabFmtList; + return (_SeqTabFmtList == null) ? _SeqTabFmtList = new SeqTabFmtList(SelectNodes("SequentialTabFormat/SeqTabFmt"), MyFormat) : _SeqTabFmtList; } } private StepSectionPrintData _StepSectionPrintData; @@ -3102,70 +2963,29 @@ namespace VEPROMS.CSLA.Library return (_StepSectionPrintData == null) ? _StepSectionPrintData = new StepSectionPrintData(SelectSingleNode("StpSectPrtData")) : _StepSectionPrintData; } } - private LazyLoad _TopRow; - public int? TopRow - { - get - { - return LazyLoad(ref _TopRow, "@TopRow"); - } - } - //private LazyLoad _SeqStart; - //public string SeqStart - //{ - // get - // { - // return LazyLoad(ref _SeqStart, "@SeqStart"); - // } - //} - //private LazyLoad _LeftJustSeqTab; - //public string LeftJustSeqTab - //{ - // get - // { - // return LazyLoad(ref _LeftJustSeqTab, "@LeftJustSeqTab") ; - // } - //} - //private LazyLoad _HighSeqStart; - //public int? HighSeqStart - //{ - // get - // { - // return LazyLoad(ref _HighSeqStart, "@HighSeqStart"); - // } - //} + // indent character used in RTF + // base format has this set to "0" which the code that uses this will resign this to "\x5" private LazyLoad _IndentToken; public string IndentToken - { - get - { - return LazyLoad(ref _IndentToken, "@IndentToken"); - } - } - private LazyLoad _NumberOfHighLevelSteps; - public int? NumberOfHighLevelSteps - { - get - { - return LazyLoad(ref _NumberOfHighLevelSteps, "@NumberOfHighLevelSteps"); - } - } - private LazyLoad _NumberOfSubStypeTypes; - public int? NumberOfSubStypeTypes - { + { get { - return LazyLoad(ref _NumberOfSubStypeTypes, "@NumberOfSubStepTypes"); - } + return LazyLoad(ref _IndentToken, "@IndentToken"); + } } + // this is the default bullet character used for sub-step types that are indented and then use a bullet as the + // sub-step tab. Base format has this as a solid bullet (ascii character number 7), + // other plants use lower cased 'o' for an open bullet. private LazyLoad _IdentB; public string IdentB - { - get + { + get { return LazyLoad(ref _IdentB, "@IdentB"); - } + } } + // special step tabbing and print formatting for enhanced background documennts + // - required by Wolf Creek's background format. private LazyLoad _WolfCreekBackgroundFormat; public bool WolfCreekBackgroundFormat { @@ -3174,6 +2994,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _WolfCreekBackgroundFormat, "@WolfCreekBackgroundFormat"); } } + + // special formatting of steps and sub-steps to create an on the fly table when printed private LazyLoad _WolfcreekCKLFormat; public bool WolfcreekCKLFormat { @@ -3182,14 +3004,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _WolfcreekCKLFormat, "@WolfcreekCKLFormat"); } } - private LazyLoad _WolfcreekCKLBackgndFormat; - public bool WolfcreekCKLBackgndFormat - { - get - { - return LazyLoad(ref _WolfcreekCKLBackgndFormat, "@WolfcreekCKLBackgndFormat"); - } - } + + // special formatting Vogtle Unit 3 and 4 Backgrounds: allows use of override width on AND and List sub-step types, + // and the calculation of the width of the paragraph sub-step type private LazyLoad _Vogtle3and4BackgroundFormat; public bool Vogtle3and4BackgroundFormat { @@ -3198,6 +3015,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Vogtle3and4BackgroundFormat, "@Vogtle3and4BackgroundFormat"); } } + + // This translates into nx10x10y where y is superscripted. + // For example, .E3 -> x103 where 3 is superscripted + // and 10.E5 -> 10x10-5 where 5 is superscripted private LazyLoad _FortranFormatNumbers; public bool FortranFormatNumbers { @@ -3206,14 +3027,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _FortranFormatNumbers, "@FortranFormatNumbers"); } } - private LazyLoad _UseTopContinueMessageAtEnd; - public bool UseTopContinueMessageAtEnd - { - get - { - return LazyLoad(ref _UseTopContinueMessageAtEnd, "@UseTopContinueMessageAtEnd"); - } - } + + // FloatingContinueMessage format flag: + // if breaking at the AER put continue message in left column, + // if breaking RNO put continue message in Right column. private LazyLoad _FloatingContinueMessage; public bool FloatingContinueMessage { @@ -3222,14 +3039,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _FloatingContinueMessage, "@FloatingContinueMessage"); } } - private LazyLoad _WrapSameAsEdit; - public bool WrapSameAsEdit - { - get - { - return LazyLoad(ref _WrapSameAsEdit, "@WrapSameAsEdit"); - } - } + + // used when section title is not printed via the pagelist, will print the title with "continued" + // appended to it when the section print multiple pages private LazyLoad _ContinueSectionHeader; public bool ContinueSectionHeader { @@ -3238,6 +3050,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ContinueSectionHeader, "@ContinueSectionHeader"); } } + + // the font size of the text that is sub-scripted is made smaller private LazyLoad _CompressHPSub; public bool CompressHPSub { @@ -3246,6 +3060,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CompressHPSub, "@CompressHPSub"); } } + + // the font size of the text that is super-scripted is made smaller private LazyLoad _CompressHPSuper; public bool CompressHPSuper { @@ -3254,6 +3070,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CompressHPSuper, "@CompressHPSuper"); } } + + // special handling of super and sub scripts when the font is a proportial font private LazyLoad _CompressPropSubSup; public bool CompressPropSubSup { @@ -3262,30 +3080,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CompressPropSubSup, "@CompressPropSubSup"); } } - private LazyLoad _UndSpecialStepsFoldout; - public bool UndSpecialStepsFoldout - { - get - { - return LazyLoad(ref _UndSpecialStepsFoldout, "@UndSpecialStepsFoldout"); - } - } - private LazyLoad _UnderlineAllMetaTitles; - public bool UnderlineAllMetaTitles - { - get - { - return LazyLoad(ref _UnderlineAllMetaTitles, "@UnderlineAllMetaTitles"); - } - } - private LazyLoad _BoldOnlySectionZero; - public bool BoldOnlySectionZero - { - get - { - return LazyLoad(ref _BoldOnlySectionZero, "@BoldOnlySectionZero"); - } - } + // used in Ginna's Attachment format // adjust the width of the Cautions and Note to not exend page the end of the HLS width // ie, shorten the width if the Caution or Note is off of a sub-step @@ -3307,6 +3102,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _OnlyBulletSameCautionNoteType, "@OnlyBulletSameCautionNoteType"); } } + + // ImperfectStructure is used so that the sequential numbering for substeps under an RNO is not same + // numbering (alpha vs numeric), if the HLS has substeps - WCN uses this, as well as other plants. + // skips the step tab level ahead by 2 more private LazyLoad _ImperfectStructure; public bool ImperfectStructure { @@ -3315,6 +3114,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ImperfectStructure, "@ImperfectStructure"); } } + + // like imperfectStructure, but only for the first level RNO private LazyLoad _ImperfectSubstep; public bool ImperfectSubstep { @@ -3323,6 +3124,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ImperfectSubstep, "@ImperfectSubstep"); } } + + // used with ImperfectStructure, skips the step tab level ahead by 2 more (for a total of 4) private LazyLoad _ImperfectStructurePlus4; public bool ImperfectStructurePlus4 { @@ -3331,6 +3134,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ImperfectStructurePlus4, "@ImperfectStructurePlus4"); } } + + // When the sub-step tab include it's parent tab, this flag will ignor any step/sub-step tabs that are not a number or letter private LazyLoad _SkipNonSeqTabWithPar; public bool SkipNonSeqTabWithPar { @@ -3339,6 +3144,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SkipNonSeqTabWithPar, "@SkipNonSeqTabWithPar"); } } + + // when determining the sub-step level (for tabs and printing), count only sequential sub-steps (excluding RNOs, Cautions, and Notes private LazyLoad _CountAllSubLevels; public bool CountAllSubLevels { @@ -3347,22 +3154,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CountAllSubLevels, "@CountAllSubLevels"); } } - private LazyLoad _UseMultiLineSectionTitle; - public bool UseMultiLineSectionTitle - { - get - { - return LazyLoad(ref _UseMultiLineSectionTitle, "@UseMultiLineSectionTitle"); - } - } - private LazyLoad _AdjustRNOCautionNoteWidth; - public bool AdjustRNOCautionNoteWidth - { - get - { - return LazyLoad(ref _AdjustRNOCautionNoteWidth, "@AdjustRNOCautionNoteWidth"); - } - } + + // don't reset (remove) the indent (RTF indent char) on step text when there are hard returns private LazyLoad _DontResetIndentOnNewline; public bool DontResetIndentOnNewline { @@ -3371,7 +3164,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _DontResetIndentOnNewline, "@DontResetIndentOnNewline"); } } + // C2018-024 I in Arial font changed to I in TimesNewRoman + // put in for McGuire (MCGall format) private LazyLoad _ChangeFontUpperCaseIinArial; public bool ChangeFontUpperCaseIinArial { @@ -3381,7 +3176,7 @@ namespace VEPROMS.CSLA.Library } } } - #endregion + #endregion - StepSectionData #region TextTypeValue [TypeConverter(typeof(ExpandableObjectConverter))] public class TextTypeValue : vlnFormatItem @@ -3390,11 +3185,11 @@ namespace VEPROMS.CSLA.Library public TextTypeValue() : base() { } private LazyLoad _TheValue; public int? TheValue - { - get + { + get { return LazyLoad(ref _TheValue, "text()"); - } + } } public override string GetPDDisplayName() { return "Value"; } @@ -3407,14 +3202,14 @@ namespace VEPROMS.CSLA.Library return TheValue.ToString(); } } - #endregion + #endregion - TextTypeValue #region TextTypeValueList [TypeConverter(typeof(vlnListConverter))] public class TextTypeValueList : vlnFormatList { public TextTypeValueList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } } - #endregion + #endregion - TextTypeValueList #region TextType [TypeConverter(typeof(ExpandableObjectConverter))] public class TextType : vlnFormatItem @@ -3424,11 +3219,11 @@ namespace VEPROMS.CSLA.Library //[Category("Strings")] private LazyLoad _Text; public string Text - { - get + { + get { - return LazyLoad(ref _Text, "text()"); - } + return LazyLoad(ref _Text, "text()"); + } } public override string GetPDDisplayName() { return "Text"; } @@ -3441,180 +3236,14 @@ namespace VEPROMS.CSLA.Library return Text; } } - #endregion + #endregion - TextType #region TextTypeList [TypeConverter(typeof(vlnListConverter))] public class TextTypeList : vlnFormatList { public TextTypeList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } } - #endregion - #region OLD - SeqTab - //[TypeConverter(typeof(ExpandableObjectConverter))] - //public class SeqTab : vlnFormatItem - //{ - // public SeqTab(XmlNode xmlNode) : base(xmlNode) { } - // public SeqTab() : base() { } - // private LazyLoad _Text; - // public string Text - // { - // get - // { - // return LazyLoad(ref _Text, "text()"); - // } - // } - // public override string GetPDDisplayName() - // { return "Text"; } - // public override string GetPDDescription() - // { return string.Format("SeqTab '{0}'", Text); } - // public override string GetPDCategory() - // { return "Seq Tab"; } - // public override string ToString() - // { - // return Text; - // } - //} - #endregion - #region OLD - SeqTabList - //[TypeConverter(typeof(vlnListConverter))] - //public class SeqTabList : vlnFormatList - //{ - // public SeqTabList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } - //} - #endregion - #region OLD - PreSeqTabEdit - //[TypeConverter(typeof(ExpandableObjectConverter))] - //public class PreSeqTabEdit : vlnFormatItem - //{ - // public PreSeqTabEdit(XmlNode xmlNode) : base(xmlNode) { } - // public PreSeqTabEdit() : base() { } - // //[Category("Strings")] - // private LazyLoad _Text; - // public string Text - // { - // get - // { - // return LazyLoad(ref _Text, "text()"); - // } - // } - // public override string GetPDDisplayName() - // { return "Text"; } - // public override string GetPDDescription() - // { return string.Format("PreSeqTabEdit '{0}'", Text); } - // public override string GetPDCategory() - // { return "PreSeq Tab Edit"; } - // public override string ToString() - // { - // return Text; - // } - //} - #endregion - #region OLD - PreSeqTabEditList - //[TypeConverter(typeof(vlnListConverter))] - //public class PreSeqTabEditList : vlnFormatList - //{ - // public PreSeqTabEditList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } - //} - #endregion - #region OLD - PreSeqTabPrint - //[TypeConverter(typeof(ExpandableObjectConverter))] - //public class PreSeqTabPrint : vlnFormatItem - //{ - // public PreSeqTabPrint(XmlNode xmlNode) : base(xmlNode) { } - // public PreSeqTabPrint() : base() { } - // private LazyLoad _Text; - // public string Text - // { - // get - // { - // return LazyLoad(ref _Text, "text()"); - // } - // } - // public override string GetPDDisplayName() - // { return "Text"; } - // public override string GetPDDescription() - // { return string.Format("PreSeqTabPrint '{0}'", Text); } - // public override string GetPDCategory() - // { return "PreSeq Tab Printt"; } - // public override string ToString() - // { - // return Text; - // } - //} - #endregion - #region OLD - PreSeqTabPrintList - //[TypeConverter(typeof(vlnListConverter))] - //public class PreSeqTabPrintList : vlnFormatList - //{ - // public PreSeqTabPrintList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } - //} - #endregion - #region OLD - PostSeqTabEdit - //[TypeConverter(typeof(ExpandableObjectConverter))] - //public class PostSeqTabEdit : vlnFormatItem - //{ - // public PostSeqTabEdit(XmlNode xmlNode) : base(xmlNode) { } - // public PostSeqTabEdit() : base() { } - // private LazyLoad _Text; - // public string Text - // { - // get - // { - // return LazyLoad(ref _Text, "text()"); - // } - // } - // public override string GetPDDisplayName() - // { return "Text"; } - // public override string GetPDDescription() - // { return string.Format("PostSeqTabEdit '{0}'", Text); } - // public override string GetPDCategory() - // { return "PostSeq Tab Edit"; } - // public override string ToString() - // { - // return Text; - // } - //} - #endregion - #region OLD - PostSeqTabEditList - //[TypeConverter(typeof(vlnListConverter))] - //public class PostSeqTabEditList : vlnFormatList - //{ - // public PostSeqTabEditList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } - //} - #endregion - #region OLD - PostSeqTabPrint - //[TypeConverter(typeof(ExpandableObjectConverter))] - //public class PostSeqTabPrint : vlnFormatItem - //{ - // public PostSeqTabPrint(XmlNode xmlNode) : base(xmlNode) { } - // public PostSeqTabPrint() : base() { } - // private LazyLoad _Text; - // public string Text - // { - // get - // { - // return LazyLoad(ref _Text, "text()"); - // } - // } - // public override string GetPDDisplayName() - // { return "Text"; } - // public override string GetPDDescription() - // { return string.Format("PostSeqTabPrint '{0}'", Text); } - // public override string GetPDCategory() - // { return "PostSeq Tab Printt"; } - // public override string ToString() - // { - // return Text; - // } - //} - #endregion - #region OLD - PostSeqTabPrintList - //[TypeConverter(typeof(vlnListConverter))] - //public class PostSeqTabPrintList : vlnFormatList - //{ - // public PostSeqTabPrintList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } - //} - #endregion + #endregion - TextTypeList #region UnderlineTerminate [TypeConverter(typeof(ExpandableObjectConverter))] public class UnderlineTerminate : vlnFormatItem @@ -3640,14 +3269,14 @@ namespace VEPROMS.CSLA.Library return Text; } } - #endregion + #endregion - UnderlineTerminate #region UnderlineTerminateList [TypeConverter(typeof(vlnListConverter))] public class UnderlineTerminateList : vlnFormatList { public UnderlineTerminateList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } } - #endregion + #endregion - UnderlineTerminateList #region ObserveNCString1 [TypeConverter(typeof(ExpandableObjectConverter))] public class ObserveNCString1 : vlnFormatItem @@ -3673,14 +3302,14 @@ namespace VEPROMS.CSLA.Library return Text; } } - #endregion + #endregion - ObserveNCString1 #region ObserveNCString1List [TypeConverter(typeof(vlnListConverter))] public class ObserveNCString1List : vlnFormatList { public ObserveNCString1List(XmlNodeList xmlNodeList) : base(xmlNodeList) { } } - #endregion + #endregion - ObserveNCString1List #region ObserveNCString2 [TypeConverter(typeof(ExpandableObjectConverter))] public class ObserveNCString2 : vlnFormatItem @@ -3706,38 +3335,51 @@ namespace VEPROMS.CSLA.Library return Text; } } - #endregion + #endregion - ObserveNCString2 #region ObserveNCString2List [TypeConverter(typeof(vlnListConverter))] public class ObserveNCString2List : vlnFormatList { public ObserveNCString2List(XmlNodeList xmlNodeList) : base(xmlNodeList) { } } - #endregion + #endregion - ObserveNCString2List #region ReplaceStr + + // ReplaceStr is a ReplaceStrData item containing the string to find and the string to replace it + // it also has flags to control where the replacements are allows (high level step, sub-steps, etc) + // ex: + [TypeConverter(typeof(ExpandableObjectConverter))] public class ReplaceStr : vlnFormatItem { public ReplaceStr(XmlNode xmlNode) : base(xmlNode) { } public ReplaceStr() : base() { } [Category("Strings")] + + // the string what will be replaced private LazyLoad _ReplaceWord; public string ReplaceWord - { - get + { + get { return LazyLoad(ref _ReplaceWord, "@ReplaceWord"); - } + } } [Category("Strings")] + // string to use for the replacement + private LazyLoad _ReplaceWith; public string ReplaceWith - { - get + { + get { return LazyLoad(ref _ReplaceWith, "@ReplaceWith"); - } + } } + // flags to control where the replacement is allowed: + // ex: "High, RNO, Caution, Note, Table, Substep, Attach" + // see E_ReplaceFlags in "CSLA.Library\Format\ENums.cs" for the complete list + private LazyLoad _Flag; public E_ReplaceFlags? Flag { @@ -3749,7 +3391,7 @@ namespace VEPROMS.CSLA.Library public override string GetPDDisplayName() { return ReplaceWord; } public override string GetPDDescription() - { return string.Format("Replace '{0}' with '{1}'",ReplaceWord,ReplaceWith); } + { return string.Format("Replace '{0}' with '{1}'", ReplaceWord, ReplaceWith); } public override string GetPDCategory() { return "Words to Replace"; } public override string ToString() @@ -3758,20 +3400,23 @@ namespace VEPROMS.CSLA.Library } } - #endregion + #endregion - ReplaceStr #region ReplaceStrList [TypeConverter(typeof(vlnListConverter))] - public class ReplaceStrList : vlnFormatList + public class ReplaceStrList : vlnFormatList { public ReplaceStrList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } } - #endregion + #endregion - ReplaceStrList #region ReplaceChar + // Information to replace a symbol character with a new size and/or a difference symbol [TypeConverter(typeof(ExpandableObjectConverter))] public class ReplaceChar : vlnFormatItem, IVlnIndexedFormatItem { public ReplaceChar(XmlNode xmlNode) : base(xmlNode) { } public ReplaceChar() : base() { } + + // A unique index number for this symbol list private LazyLoad _Index; public int? Index { @@ -3781,6 +3426,8 @@ namespace VEPROMS.CSLA.Library } } [Category("Strings")] + + //The Unicode number of the symbol we are replacing private LazyLoad _Unicode; public string Unicode { @@ -3790,6 +3437,8 @@ namespace VEPROMS.CSLA.Library } } [Category("Strings")] + + //The Unicode number of the symbol we want to use instead (this is optional) private LazyLoad _Replace; public string Replace { @@ -3799,6 +3448,8 @@ namespace VEPROMS.CSLA.Library } } [Category("Strings")] + + // The font family of the replacement symbol character (this is optional) private LazyLoad _Family; public string Family { @@ -3808,6 +3459,7 @@ namespace VEPROMS.CSLA.Library } } [Category("FontStyle?")] + // the font style for the symbol character (bold, Italics, Underline) - this is optional private LazyLoad _Style; // format has E_Style value. The public will translate it to a systemdrawing.FontStyle used in printing public FontStyle? Style { @@ -3826,10 +3478,12 @@ namespace VEPROMS.CSLA.Library sdfStyle |= FontStyle.Underline; } return sdfStyle; // return systemdrawing.FontStyle - //return LazyLoad(ref _Style, "@Style"); + //return LazyLoad(ref _Style, "@Style"); } } [Category("float?")] + + // The font size of the replacement symbol character (this is optional) private LazyLoad _Size; public float? Size { @@ -3850,10 +3504,10 @@ namespace VEPROMS.CSLA.Library } } - #endregion + #endregion - ReplaceChar #region ReplaceSymbolCharList [TypeConverter(typeof(vlnIndexedListConverter))] - public class ReplaceSymbolCharList : vlnIndexedFormatList + public class ReplaceSymbolCharList : vlnIndexedFormatList { public ReplaceSymbolCharList(XmlNodeList xmlNodeList, IFormatOrFormatInfo myFormat) : base(xmlNodeList, myFormat) { } public override vlnIndexedFormatList InheritedList @@ -3867,43 +3521,23 @@ namespace VEPROMS.CSLA.Library } } } - #endregion + #endregion - ReplaceSymbolCharList #region StepSectionLayoutData public class StepSectionLayoutData : vlnFormatItem { public StepSectionLayoutData(XmlNode xmlNode) : base(xmlNode) { } - private TopOfPage _TopOfPage; - public TopOfPage TopOfPage - { - get - { - return (_TopOfPage == null)? _TopOfPage = new TopOfPage(SelectSingleNode("TopOfPage")): _TopOfPage; - } - } + // the font and placement settings for the separator words used for OR the sub-steps + // and the Explicit And sub-steps private Separator _Separator; public Separator Separator { get { - return (_Separator == null) ?_Separator = new Separator(SelectSingleNode("Separator")):_Separator; + return (_Separator == null) ? _Separator = new Separator(SelectSingleNode("Separator")) : _Separator; } } - private LazyLoad _LastLineToStartStep; - public float? LastLineToStartStep - { - get - { - return LazyLoad(ref _LastLineToStartStep, "@LastLineToStartStep"); - } - } - private LazyLoad _LineDrawingOption; - public int? LineDrawingOption - { - get - { - return LazyLoad(ref _LineDrawingOption, "@LineDrawingOption"); - } - } + // the size of a tab in points. If not set, then 6 points will be used. + // note - don't add and set this to Base format, some code check for no value set private LazyLoad _TabPtsPerChar; public float? TabPtsPerChar { @@ -3912,6 +3546,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TabPtsPerChar, "@TabPtsPerChar"); } } + // will define the placement of Notes, Cautions, and Warning with repect to the step they apply + // value is a string containing a list of StepData Index numbers for the defined Cautions and Notes types - a Warning is a redifined Caution or Note private LazyLoad _CautionNoteOrder; public string CautionNoteOrder { @@ -3920,70 +3556,58 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CautionNoteOrder, "@CautionNoteOrder"); } } + + // starting position for High Level step text from the left margin private LazyLoad _ColS; public float? ColS - { - get - { + { + get + { return LazyLoad(ref _ColS, "@ColS"); - } + } } + + // starting positon for cautions and notes that do not have a border (box format associated to it) private LazyLoad _ColT; public float? ColT - { - get + { + get { return LazyLoad(ref _ColT, "@ColT"); - } - } - private LazyLoad _ColAbs; - public float? ColAbs - { - get - { - return LazyLoad(ref _ColAbs, "@ColAbs"); - } + } } + + // Width of Text (note/caution) fields. This is overridden by BxTxtWidth, if the text is boxed. private LazyLoad _WidT; public float? WidT - { - get + { + get { return LazyLoad(ref _WidT, "@WidT"); - } + } } + + // default column mode of the step editor sections - used in Section Properties + // if PMode is zero, the default column mode is two column private LazyLoad _PMode; public int? PMode - { - get + { + get { return LazyLoad(ref _PMode, "@PMode"); - } + } } + + // default column mode of the step editor sections - used in Procedure Properties private LazyLoad _ColumnMode; public int? ColumnMode - { - get + { + get { return LazyLoad(ref _ColumnMode, "@ColumnMode"); - } - } - private LazyLoad _MaxRNO; - public int? MaxRNO - { - get - { - return LazyLoad(ref _MaxRNO, "@MaxRNO"); - } - } - private LazyLoad _MaxRNOTable; - public string MaxRNOTable - { - get - { - return LazyLoad(ref _MaxRNOTable, "@MaxRNOTable"); - } + } } + // set the width of RNO text to be same as its parent - put in for V.C. Summer (SUM formats) private LazyLoad _RNOWidthSameAsHighParent; public bool RNOWidthSameAsHighParent { @@ -3992,6 +3616,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RNOWidthSameAsHighParent, "@RNOWidthSameAsHighParent"); } } + // used with the RNOWidthSameAsHighParent flag, is width value if this is the top RNO (parent RNO) + // - put in for V.C. Summer (SUM formats) private LazyLoad _SingleColumnRNOIndent; public float? SingleColumnRNOIndent { @@ -4000,6 +3626,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SingleColumnRNOIndent, "@SingleColumnRNOIndent"); } } + + // B2020-140 for Wolf Creek check boxes in tables were printing too high in the table cells - added format variable to overide topPlacementAdjust (WCN format files) private LazyLoad _OverrideTableTopIndent; public int? OverrideTableTopIndent { @@ -4008,54 +3636,47 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _OverrideTableTopIndent, "@OverrideTableTopIndent"); } } + // the space between columns of the procedure text (between AER and RNO columns) private LazyLoad _ColRTable; public string ColRTable - { - get + { + get { return LazyLoad(ref _ColRTable, "@ColRTable"); - } + } } + + // the high level step text width, in the PROMS editor, based on on many columns the procedure has private LazyLoad _WidSTableEdit; public string WidSTableEdit - { - get + { + get { return LazyLoad(ref _WidSTableEdit, "@WidSTableEdit"); - } + } } + + // the high level step text width, when printed, based on on many columns the procedure has private LazyLoad _WidSTablePrint; public string WidSTablePrint - { - get - { + { + get + { return LazyLoad(ref _WidSTablePrint, "@WidSTablePrint"); - } - } - private LazyLoad _AdjRNOCol; - public float? AdjRNOCol - { - get - { - return LazyLoad(ref _AdjRNOCol, "@AdjRNOCol"); - } - } - private LazyLoad _EndMessagePos; - public int? EndMessagePos - { - get - { - return LazyLoad(ref _EndMessagePos, "@EndMessagePos"); - } + } } + + // Adjust the RNO width off the high level step private LazyLoad _RNOWidthAlt; public string RNOWidthAlt - { - get - { + { + get + { return LazyLoad(ref _RNOWidthAlt, "@RNOWidthAlt"); - } + } } + + // adjust the RNO width for all RNOs - D.C. Cook (AEP formats) private LazyLoad _RNOWidthAltAll; public int? RNOWidthAltAll { @@ -4064,6 +3685,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RNOWidthAltAll, "@RNOWidthAltAll"); } } + // adjust the width of the RNO off of an AER sub-step private LazyLoad _RNOWidthAdj; public string RNOWidthAdj { @@ -4072,6 +3694,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RNOWidthAdj, "@RNOWidthAdj"); } } + + // Use the parent's RNO indent private LazyLoad _UseRNOParentIdent; public string UseRNOParentIdent { @@ -4080,6 +3704,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseRNOParentIdent, "@UseRNOParentIdent"); } } + // Adjusts the placement of the Note and Caution tabs in deviations private LazyLoad _DevNoteOrCautionTabOffset; public string DevNoteOrCautionTabOffset { @@ -4088,6 +3713,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _DevNoteOrCautionTabOffset, "@DevNoteOrCautionTabOffset"); } } + + // adjustment to the starting positoin of the note/caution boxes + // - this is used sub-formats for Byron and Braidwood (CEW_00, EXCLN01) private LazyLoad _BoxLeftAdj; public string BoxLeftAdj { @@ -4096,78 +3724,20 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BoxLeftAdj, "@BoxLeftAdj"); } } - private LazyLoad _HLSWidthOVRD; - public int? HLSWidthOVRD - { - get - { - return LazyLoad(ref _HLSWidthOVRD, "@HLSWidthOVRD"); - } - } - private LazyLoad _SubPaginationWght; - public int? SubPaginationWght - { - get - { - return LazyLoad(ref _SubPaginationWght, "@SubPaginationWght"); - } - } - private LazyLoad _TextTitleAdjustment; - public int? TextTitleAdjustment - { - get - { - return LazyLoad(ref _TextTitleAdjustment, "@TextTitleAdjustment"); - } - } - private VE_Font _VertStyle; - public VE_Font VertStyle + + // B2019-049 added check for table being in a Caution or Note - if so, use the single column setting for the format variable TableCenterPos + private LazyLoad _TableCenterPos; + public string TableCenterPos { get { - return (_VertStyle == null)? _VertStyle = new VE_Font(base.XmlNode): _VertStyle; + return LazyLoad(ref _TableCenterPos, "@TableCenterPos"); } } - private LazyLoad _TableCenterPos; - public string TableCenterPos - { - get - { - return LazyLoad(ref _TableCenterPos, "@TableCenterPos"); - } - } - private LazyLoad _LowerLimitDivisor; - public string LowerLimitDivisor - { - get - { - return LazyLoad(ref _LowerLimitDivisor, "@LowerLimitDivisor"); - } - } - private LazyLoad _NonLinkedStepNumber; - public string NonLinkedStepNumber - { - get - { - return LazyLoad(ref _NonLinkedStepNumber, "@NonLinkedStepNumber"); - } - } - private LazyLoad _NonLinkedCautNoteNumber; - public string NonLinkedCautNoteNumber - { - get - { - return LazyLoad(ref _NonLinkedCautNoteNumber, "@NonLinkedCautNoteNumber"); - } - } - private LazyLoad _NonLinkedRNONumber; - public string NonLinkedRNONumber - { - get - { - return LazyLoad(ref _NonLinkedRNONumber, "@NonLinkedRNONumber"); - } - } + + // Turn on editing and printing format for Deviation Documents (non-enhanced document) + // uses the Caution and Note type for the EOP and ERG step number, the widths are reduced + // and they are placed to the left of the high level step text private LazyLoad _Dev_Format; public bool Dev_Format { @@ -4176,6 +3746,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Dev_Format, "@Dev_Format"); } } + // links procedure step number and text (also links Cautions and Note). Uses a template for the step editor to enter deviation and support text (like enhanced backgrounds). Prints like the non-enhanced deviation document private LazyLoad _EnhancedShortFormDev; public bool EnhancedShortFormDev { @@ -4184,6 +3755,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _EnhancedShortFormDev, "@EnhancedShortFormDev"); } } + + // this flag is set in the plant format file when you want to be able to break steps that begin in the + // middle of the page. If this flag is not set, then any step that will not fit on a single page will + // cause a page break, i.e. start at the top of the next page. private LazyLoad _SpecialPageBreakFlag; public bool SpecialPageBreakFlag { @@ -4192,6 +3767,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpecialPageBreakFlag, "@SpecialPageBreakFlag"); } } + + // paginate on a step if the entire step will fit on it's own page but not fit on the remainer of the current page private LazyLoad _PaginateOnStepThatWillFitOnBlankPage; public bool PaginateOnStepThatWillFitOnBlankPage { @@ -4200,6 +3777,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PaginateOnStepThatWillFitOnBlankPage, "@PaginateOnStepThatWillFitOnBlankPage"); } } + + // allows the first child to be separated from its parent private LazyLoad _PaginateOnFirstSubstep; public bool PaginateOnFirstSubstep { @@ -4208,15 +3787,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PaginateOnFirstSubstep, "@PaginateOnFirstSubstep"); } } - private LazyLoad _PaginateOnFirstSubstep2X; - public bool PaginateOnFirstSubstep2X - { - get - { - return LazyLoad(ref _PaginateOnFirstSubstep2X, "@PaginateOnFirstSubstep2X"); - } - } - private LazyLoad _PageBreakParentWithTable; // B2020-101: Add format flag for table pagination + + // keep the table's parent with the table (if at all possible, don't break the table from the parent) + private LazyLoad _PageBreakParentWithTable; // B2020-101: Add format flag for table pagination public bool PageBreakParentWithTable { get @@ -4224,34 +3797,23 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PageBreakParentWithTable, "@PageBreakParentWithTable"); } } - private LazyLoad _UseHalfLines; - public bool UseHalfLines - { - get - { - return LazyLoad(ref _UseHalfLines, "@UseHalfLines"); - } - } - //private LazyLoad _TryToFillHalfOfPage; C2019-030 Removed Unused Code - //public bool TryToFillHalfOfPage - //{ - // get - // { - // return LazyLoad(ref _TryToFillHalfOfPage, "@TryToFillHalfOfPage"); - // } - //} + + + // when needed to fit an entire step on a page, PROMS will print the step at 7 lines per inch instead of the standard 6 lines per inch private LazyLoad _CompressSteps; public bool CompressSteps { get { if (PlantFormat.IgnoreUCF) return LazyLoad(ref _CompressSteps, "@CompressSteps"); - bool? localvalue = null; - FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat); - if (fc != null) localvalue = fc.PlantFormat.FormatData.Flags.CompressSteps; + bool? localvalue = null; + FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat); + if (fc != null) localvalue = fc.PlantFormat.FormatData.Flags.CompressSteps; return localvalue ?? LazyLoad(ref _CompressSteps, "@CompressSteps"); } } + // use the STExtraSpace value (defined for each step type) at the top of page + // when that step/sub-step type is the first step part on the page private LazyLoad _DoSTExtraAtTop; public bool DoSTExtraAtTop { @@ -4260,6 +3822,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _DoSTExtraAtTop, "@DoSTExtraAtTop"); } } + + // even if a step will fit on a page by itself, print as much of the step as logically possible on the current page private LazyLoad _KeepStepsOnPage; public bool KeepStepsOnPage { @@ -4269,9 +3833,9 @@ namespace VEPROMS.CSLA.Library } } private LazyLoad _NoOrphans1; - /// - /// B2017-154 Np Orphans (single sub-step left over from previous page) No Children - /// + // B2017-154 No Orphans (single sub-step left over from previous page) No Children + // - Don't leave an orphan on the next page if the high level step and first sub-step will fit on the current page + // note: this was put in the V.C.Summ AP1000 plant public bool NoOrphans1 { get @@ -4279,6 +3843,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoOrphans1, "@NoOrphans1"); } } + + // the format default setting as to whether each procedure section start on their own page + // The base format has this set to true - each section starts on a new page private LazyLoad _BreakOnSections; public bool BreakOnSections { @@ -4287,6 +3854,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BreakOnSections, "@BreakOnSections"); } } + + // will print the section number and title before printing the section text. used only with the PROMS + // step editor sections (not Word sections). section number and title will print only on the first page + // of the section. a check box on the section properties page turns printing of this on/off private LazyLoad _ShowSectionTitles; public bool ShowSectionTitles { @@ -4295,6 +3866,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ShowSectionTitles, "@ShowSectionTitles"); } } + + // will print the defined section end message for single columns sections. + // the default setting is True private LazyLoad _EndForSingle; public bool EndForSingle { @@ -4303,14 +3877,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _EndForSingle, "@EndForSingle"); } } - private LazyLoad _PaginateOnFirstSubstep3X; - public bool PaginateOnFirstSubstep3X - { - get - { - return LazyLoad(ref _PaginateOnFirstSubstep3X, "@PaginateOnFirstSubstep3X"); - } - } + // Special pagination case used in some background document formats. This will turn off the KeepStepsOnPage flag when a paragraph off of a High Level step was put on next page (IP2 bck: E-3/References), and a paragraph was writing into the footer (FR-H.1 step 2.2.3.1. KBR 10/14/14) private LazyLoad _PaginateOnLowerStepLevel; public bool PaginateOnLowerStepLevel { @@ -4319,7 +3886,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PaginateOnLowerStepLevel, "@PaginateOnLowerStepLevel"); } } + // B2023-088: alarm format pagination + // Special pagination for Alarm procedures to keep substeps with the high level step private LazyLoad _AlarmPagination; public bool AlarmPagination { @@ -4328,6 +3897,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AlarmPagination, "@AlarmPagination"); } } + + // For McGuire and Catawba, they use CustomSpacing which inserts a blank line before high level steps + // if we paginate on one of these blank lines, we want to skip that blank line so that there isn't an + // extra blank line at the top of the page. private LazyLoad _CustomSpacing; public bool CustomSpacing { @@ -4336,22 +3909,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CustomSpacing, "@CustomSpacing"); } } - private LazyLoad _SplitStepInPrntStep; - public bool SplitStepInPrntStep - { - get - { - return LazyLoad(ref _SplitStepInPrntStep, "@SplitStepInPrntStep"); - } - } - private LazyLoad _LineAboveUnderSection; - public bool LineAboveUnderSection - { - get - { - return LazyLoad(ref _LineAboveUnderSection, "@LineAboveUnderSection"); - } - } + + // when set to False, a caluation for centering text is done with respect to the CPI defined for + // the font to better match the centering of the 16-bit VEPROMS application private LazyLoad _PicaIgnoreFiveSixths; public bool PicaIgnoreFiveSixths { @@ -4360,22 +3920,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PicaIgnoreFiveSixths, "@PicaIgnoreFiveSixths"); } } - private LazyLoad _SpaceForNoSecNumb; - public bool SpaceForNoSecNumb - { - get - { - return LazyLoad(ref _SpaceForNoSecNumb, "@SpaceForNoSecNumb"); - } - } - private LazyLoad _PageBreakOnFirstBlankLine; - public bool PageBreakOnFirstBlankLine - { - get - { - return LazyLoad(ref _PageBreakOnFirstBlankLine, "@PageBreakOnFirstBlankLine"); - } - } + + // keep sub-steps together - on a page by themselves private LazyLoad _PutOnPageByItself; public bool PutOnPageByItself { @@ -4384,14 +3930,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PutOnPageByItself, "@PutOnPageByItself"); } } - private LazyLoad _PaginateAtHighestPaginLevel; - public bool PaginateAtHighestPaginLevel - { - get - { - return LazyLoad(ref _PaginateAtHighestPaginLevel, "@PaginateAtHighestPaginLevel"); - } - } + + // If a high level step, the 16bit code uses the value of the extra space + // from the high level step format regardless of what type of high level step it is: + // Added check for UseSTExtraRealValue, if set, we want to use what is set for the specific step type private LazyLoad _UseSTExtraRealValue; public bool UseSTExtraRealValue { @@ -4400,14 +3942,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseSTExtraRealValue, "@UseSTExtraRealValue"); } } - private LazyLoad _DoSectionSeparatorLine; - public bool DoSectionSeparatorLine - { - get - { - return LazyLoad(ref _DoSectionSeparatorLine, "@DoSectionSeparatorLine"); - } - } + + // Causes step tabs to be built according to the actual level, with respect to the section level and the step level (i.e. sub-sections count as a level) private LazyLoad _TieTabToLevel; public bool TieTabToLevel { @@ -4416,6 +3952,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TieTabToLevel, "@TieTabToLevel"); } } + + // treat sub-sections and High Level Steps as if they are at the same procedure structure level. This is used with the TieTabToLevel flag private LazyLoad _SubSectAndHighSameLevel; public bool SubSectAndHighSameLevel { @@ -4424,42 +3962,21 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SubSectAndHighSameLevel, "@SubSectAndHighSameLevel"); } } - private LazyLoad _HighLevelRNOBeforeAERSubsteps; - public bool HighLevelRNOBeforeAERSubsteps - { - get - { - return LazyLoad(ref _HighLevelRNOBeforeAERSubsteps, "@HighLevelRNOBeforeAERSubsteps"); - } - } - private LazyLoad _UseStepTypeWidthOverride; - public bool UseStepTypeWidthOverride - { - get - { - return LazyLoad(ref _UseStepTypeWidthOverride, "@UseStepTypeWidthOverride"); - } - } - private LazyLoad _UseStepTypeWidthOverrideEditPrint; - public bool UseStepTypeWidthOverrideEditPrint - { - get - { - return LazyLoad(ref _UseStepTypeWidthOverrideEditPrint, "@UseStepTypeWidthOverrideEditPrint"); - } - } + + // compress only part of the step (i.e. a sub-step) so that the entire step can fit on a page private LazyLoad _PartialStepCompression; public bool PartialStepCompression { get { if (PlantFormat.IgnoreUCF) return LazyLoad(ref _PartialStepCompression, "@PartialStepCompression"); - bool? localvalue = null; - FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat); - if (fc != null) localvalue = fc.PlantFormat.FormatData.Flags.PartialStepCompression; + bool? localvalue = null; + FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat); + if (fc != null) localvalue = fc.PlantFormat.FormatData.Flags.PartialStepCompression; return localvalue ?? LazyLoad(ref _PartialStepCompression, "@PartialStepCompression"); } } + // remove the ".0" from a bottom continue message private LazyLoad _VirtualDotInHLSTab; public bool VirtualDotInHLSTab { @@ -4468,30 +3985,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _VirtualDotInHLSTab, "@VirtualDotInHLSTab"); } } - private LazyLoad _OverrideEnhancedTabs; - public bool OverrideEnhancedTabs - { - get - { - return LazyLoad(ref _OverrideEnhancedTabs, "@OverrideEnhancedTabs"); - } - } - private LazyLoad _RNO; - public bool RNO - { - get - { - return LazyLoad(ref _RNO, "@RNO"); - } - } - private LazyLoad _OnlySingleColumn; - public bool OnlySingleColumn - { - get - { - return LazyLoad(ref _OnlySingleColumn, "@OnlySingleColumn"); - } - } + // was put in for NSP's Cautions and Notes which are not boxed but formatted differently than other non-boxed Cautions and Notes, allow to specify a starting column and width where the Note/Caution step types are defined private LazyLoad _NullBox; public bool NullBox { @@ -4500,6 +3994,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NullBox, "@NullBox"); } } + + // turns on the ability to add Notes and Cautions off of a Section title in the PROMS step editor private LazyLoad _AllowNoteCautionAdd; public bool AllowNoteCautionAdd { @@ -4508,7 +4004,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd"); } } - // F2024-049 changed to specify the sub-step level via the format file (Generic EOP and Vogtle 3&4) + + // F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step + // F2024-049 changed to specify the level, to change to, via the format file (Generic EOP and Vogtle 3&4) private LazyLoad _ResetSeqNumberingAfterUnnumberedHLS; public int? ResetSeqNumberingAfterUnnumberedHLS { @@ -4518,50 +4016,24 @@ namespace VEPROMS.CSLA.Library } } } - #endregion - #region TopOfPage - public class TopOfPage : vlnFormatItem - { - public TopOfPage(XmlNode xmlNode) : base(xmlNode) { } - private LazyLoad _Row; - public float? Row - { - get - { - return LazyLoad(ref _Row, "@Row"); - } - } - private LazyLoad _Col; - public float? Col - { - get - { - return LazyLoad(ref _Col, "@Col"); - } - } - private VE_Font _Font; - public VE_Font Font - { - get - { - return (_Font == null? _Font = new VE_Font(base.XmlNode): _Font); - } - } - } - #endregion + #endregion - StepSectionLayoutData #region Separator public class Separator : vlnFormatItem { public Separator(XmlNode xmlNode) : base(xmlNode) { } + + //the placement setting for the separator words used for OR the sub-steps and the Explicit And sub-steps private LazyLoad _Location; public int? Location - { - get - { + { + get + { return LazyLoad(ref _Location, "@Location"); //return LazyLoad(ref _SeparatorLocation, "@SeparatorLocation"); - } + } } + + // the font specifications for the separator text for OR the sub-steps and the Explicit And sub-steps private VE_Font _Font; public VE_Font Font { @@ -4571,49 +4043,18 @@ namespace VEPROMS.CSLA.Library } } } - #endregion - #region StepSectionEditData - public class StepSectionEditData : vlnFormatItem - { - public StepSectionEditData(XmlNode xmlNode) : base(xmlNode) { } - private LazyLoad _ColSScreenAdj; - public float? ColSScreenAdj - { - get - { - return LazyLoad(ref _ColSScreenAdj, "@ColSScreenAdj"); - } - } - private LazyLoad _ScrnAdjRNOText; - public float? ScrnAdjRNOText - { - get - { - return LazyLoad(ref _ScrnAdjRNOText, "@ScrnAdjRNOText"); - } - } - private LazyLoad _ColRScreen; - public string ColRScreen - { - get - { - return LazyLoad(ref _ColRScreen, "@ColRScreen"); - } - } - } - #endregion + #endregion - Separator #region StepSectionPrintData public class StepSectionPrintData : vlnFormatItem { public StepSectionPrintData(XmlNode xmlNode) : base(xmlNode) { } - private LazyLoad _ImmStepHdrCol; - public float? ImmStepHdrCol - { - get - { - return LazyLoad(ref _ImmStepHdrCol, "@ImmStepHdrCol"); - } - } + + // use for the box printed around Continuous Action Steps (if defined in plant format) + // this controls whether there is 1 line or 2 lines between the box line and + // the starting/ending yoffset of the HLS. + // default is False - will put 2 lines between the box line and step text + // when set to True - will put 1 line between the box line and step text resulting in + // no extra line between the box and top/bottom of step. private LazyLoad _DiffContActBox; public bool DiffContActBox { @@ -4622,6 +4063,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _DiffContActBox, "@DiffContActBox"); } } + // will allow the drawing of a box round substeps that have a defined box private LazyLoad _ContActBoxOnSubSteps; public bool ContActBoxOnSubSteps { @@ -4630,22 +4072,18 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ContActBoxOnSubSteps, "@ContActBoxOnSubSteps"); } } - private LazyLoad _SecColHdrforActPMode; - public int? SecColHdrforActPMode - { - get - { - return LazyLoad(ref _SecColHdrforActPMode, "@SecColHdrforActPMode"); - } - } + // this will print the defined string after the last RNO for a step or sub-step + // some plants print a string of a couple spaces to add an extra blank line instead private LazyLoad _RNOSepString; public string RNOSepString - { - get + { + get { return LazyLoad(ref _RNOSepString, "@RNOSepString"); - } + } } + + // specify the length of the RNO separator. if not set, then code uses length of RNOSepString. if no RNOSepString then the code creates an empty RNO separtor. private LazyLoad _RNOSepLineLength; public float? RNOSepLineLength { @@ -4654,30 +4092,27 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RNOSepLineLength, "@RNOSepLineLength"); } } + // will print the defined string between each High Level Step type. Used in the Long Form Deviation format private LazyLoad _HLStpSeparatorString; public string HLStpSeparatorString - { - get - { - return LazyLoad(ref _HLStpSeparatorString, "@HLStpSeparatorString"); - } - } - private LazyLoad _HLRNOStpSeparatorString; - public string HLRNOStpSeparatorString - { - get - { - return LazyLoad(ref _HLRNOStpSeparatorString, "@HLRNOStpSeparatorString"); - } - } - private LazyLoad _LowerCaseRevNum; - public bool LowerCaseRevNum { get { - return LazyLoad(ref _LowerCaseRevNum, "@LowerCaseRevNum"); + return LazyLoad(ref _HLStpSeparatorString, "@HLStpSeparatorString"); } } + + // will print the defined string between each High Level RNO Step type. Used in the Long Form Deviation format + private LazyLoad _HLRNOStpSeparatorString; + public string HLRNOStpSeparatorString + { + get + { + return LazyLoad(ref _HLRNOStpSeparatorString, "@HLRNOStpSeparatorString"); + } + } + + // turns on the ability to enter a procedure set revision number (string) on the Working Draft properties page private LazyLoad _UseXtraRevNumber; public bool UseXtraRevNumber { @@ -4686,14 +4121,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseXtraRevNumber, "@UseXtraRevNumber"); } } - private LazyLoad _SpecialLandscapeMode; - public bool SpecialLandscapeMode - { - get - { - return LazyLoad(ref _SpecialLandscapeMode, "@SpecialLandscapeMode"); - } - } + + // Don't all step text to print past right margin. put in for Point Beach's Background document private LazyLoad _LimitWidToPageWid; public bool LimitWidToPageWid { @@ -4702,6 +4131,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _LimitWidToPageWid, "@LimitWidToPageWid"); } } + // add the parent tab to the step or sub-step tab private LazyLoad _CombinedTabIncludeParenTabs; public bool CombinedTabIncludeParenTabs { @@ -4710,31 +4140,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CombinedTabIncludeParenTabs, "@CombinedTabIncludeParenTabs"); } } - private VE_Font _ModifiedTextStyle; - public VE_Font ModifiedTextStyle - { - get - { - return (_ModifiedTextStyle == null)? _ModifiedTextStyle = new VE_Font(base.XmlNode):_ModifiedTextStyle; - } - } - private VE_Font _ImmStepHdrStyle; - public VE_Font ImmStepHdrStyle - { - get - { - return (_ImmStepHdrStyle == null)? _ImmStepHdrStyle = new VE_Font(base.XmlNode):_ImmStepHdrStyle; - } - } - private ImmStepHdrList _ImmStepHdrList; - public ImmStepHdrList ImmStepHdrList - { - get - { - return (_ImmStepHdrList == null)? _ImmStepHdrList = new ImmStepHdrList(SelectNodes("ImmStepHdrList/string")):_ImmStepHdrList; - } - set { _ImmStepHdrList = value; } - } + + // a list of hard coded tab placement adjustments per step level private LeftJustifyList _LeftJustifyList; public LeftJustifyList LeftJustifyList { @@ -4745,52 +4152,20 @@ namespace VEPROMS.CSLA.Library set { _LeftJustifyList = value; } } } - #region ImmStepHdr - [TypeConverter(typeof(ExpandableObjectConverter))] - public class ImmStepHdr : vlnFormatItem - { - public ImmStepHdr(XmlNode xmlNode) : base(xmlNode) { } - public ImmStepHdr() : base() { } - private LazyLoad _Text; - public string Text - { - get - { - return LazyLoad(ref _Text, "text()"); - } - } - public override string GetPDDisplayName() - { return "Text"; } - public override string GetPDDescription() - { return string.Format("ImmStepHdr '{0}'", Text); } - public override string GetPDCategory() - { return "Imm Step Hdr"; } - public override string ToString() - { - return Text; - } - } - #endregion - #region ImmStepHdrList - [TypeConverter(typeof(vlnListConverter))] - public class ImmStepHdrList : vlnFormatList - { - public ImmStepHdrList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } - } - #endregion - #region LeftJustifyList - [TypeConverter(typeof(vlnListConverter))] - public class LeftJustifyList : vlnFormatList - { - public LeftJustifyList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } - } - #endregion +#region LeftJustifyList +[TypeConverter(typeof(vlnListConverter))] +public class LeftJustifyList : vlnFormatList +{ +public LeftJustifyList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } +} #region LeftJustify [TypeConverter(typeof(ExpandableObjectConverter))] public class LeftJustify : vlnFormatItem, IVlnIndexedFormatItem { public LeftJustify(XmlNode xmlNode) : base(xmlNode) { } public LeftJustify() : base() { } + + // represents the step level in which to use the LeftJustify Size value private LazyLoad _Index; public int? Index { @@ -4799,6 +4174,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Index, "@Index"); } } + + // the LeftJustify value private LazyLoad _Size; public float? Size { @@ -4808,15 +4185,17 @@ namespace VEPROMS.CSLA.Library } } } - #endregion - #endregion + #endregion - LeftJustify + #endregion - LeftJustifyList + #endregion - StepSectionPrintData #region SeqTabFmtAll #region SeqTabFmt [TypeConverter(typeof(ExpandableObjectConverter))] - public class SeqTabFmt : vlnFormatItem,IVlnIndexedFormatItem + public class SeqTabFmt : vlnFormatItem, IVlnIndexedFormatItem { public SeqTabFmt() : base() { } - private LazyLoad _Index; //not included - is it needed? + // index number of each SeqTabFmt item in the SequentialTabFormat list + private LazyLoad _Index; [Description("SeqTab Index")] public int? Index { @@ -4825,6 +4204,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Index, "@Index"); } } + + // the token representing the type of tab to use. ex: {numeric} for a number, {alpha} for a letter private LazyLoad _TabToken; public string TabToken { @@ -4833,6 +4214,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TabToken, "@TabToken"); } } + + // the formatting definition for that tab (usually uses the "{seq}" token). defines if the tab ends with a period, closed parenthesis, etc. + // this format setting is also used for printing - we currently ignore the format setting for PrintTabFormat private LazyLoad _TabFormat; public string TabFormat { @@ -4841,6 +4225,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TabFormat, "@TabFormat"); } } + + // the formatting definition for that tab. defines if the tab ends with a period, closed parenthesis, etc. + // - we currently ignore this format setting when printing and use the value of TabFormat instead. + // leaving it this way in case we find a need to have different tab formats for editor and printing private LazyLoad _PrintTabFormat; public string PrintTabFormat { @@ -4849,16 +4237,18 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TabFormat, "@PrintTabFormat"); } } + + // when the tab is built with parent tab information, don't trim the parent tab (don't remove the surrounding spaces before building the tab private LazyLoad _DontTrimParentTabBeforeAppending; // B2019-011 for Barakah Alarm format public bool DontTrimParentTabBeforeAppending { - get - { - return LazyLoad(ref _DontTrimParentTabBeforeAppending, "@DontTrimParentTabBeforeAppending"); - } + get + { + return LazyLoad(ref _DontTrimParentTabBeforeAppending, "@DontTrimParentTabBeforeAppending"); + } } public override string GetPDDisplayName() - { return string.Format("Index [{0}]",Index); } + { return string.Format("Index [{0}]", Index); } public override string GetPDDescription() { return string.Format("Sequential Tab Format Index '{0}' Format '{1}'", Index, TabFormat); } public override string GetPDCategory() @@ -4867,13 +4257,13 @@ namespace VEPROMS.CSLA.Library { return TabFormat; } - } - #endregion + } + # endregion - SeqTabFmt #region SeqTabFmtList [TypeConverter(typeof(vlnIndexedListConverter))] public class SeqTabFmtList : vlnIndexedFormatList { - public SeqTabFmtList(XmlNodeList xmlNodeList,IFormatOrFormatInfo myFormat) : base(xmlNodeList,myFormat) { } + public SeqTabFmtList(XmlNodeList xmlNodeList, IFormatOrFormatInfo myFormat) : base(xmlNodeList, myFormat) { } public override vlnIndexedFormatList InheritedList { get @@ -4885,23 +4275,17 @@ namespace VEPROMS.CSLA.Library } } } - #endregion - #endregion - #endregion + #endregion - SeqTabFmtList + #endregion - SeqTabFmtAll + #endregion - StepSectionDataAll + #region AccSectionDataAll #region AccSectionData [TypeConverter(typeof(ExpandableObjectConverter))] public class AccSectionData : vlnFormatItem { public AccSectionData(XmlNode xmlNode) : base(xmlNode) { } - private LazyLoad _AutoContActSumSection; - public int? AutoContActSumSection - { - get - { - return LazyLoad(ref _AutoContActSumSection, "@AutoContActSumSection"); - } - } + //formatting information for the automatic table of contents private TableOfContentsData _TableOfContentsData; public TableOfContentsData TableOfContentsData { @@ -4910,68 +4294,86 @@ namespace VEPROMS.CSLA.Library return (_TableOfContentsData == null ? _TableOfContentsData = new TableOfContentsData(SelectSingleNode("TableOfContentsData")) : _TableOfContentsData); } } + + // formatting information for the generation of the Continuous Action Summary. + // Creates a table in an instance of Word that can be copied into a PROMS Word section + // and then modified as needed. (Node in XML is misspelled) private ConitnuousActionSummaryData _ContinuousActionSummaryData; public ConitnuousActionSummaryData ContinuousActionSummaryData { - get - { - return (_ContinuousActionSummaryData == null? _ContinuousActionSummaryData = new ConitnuousActionSummaryData(SelectSingleNode("ConitnuousActionSummaryData")) : _ContinuousActionSummaryData); + get + { + return (_ContinuousActionSummaryData == null ? _ContinuousActionSummaryData = new ConitnuousActionSummaryData(SelectSingleNode("ConitnuousActionSummaryData")) : _ContinuousActionSummaryData); } } } - #endregion + #endregion - AccSectionData + #region TableOfContentsData public class TableOfContentsData : vlnFormatItem { public TableOfContentsData(XmlNode xmlNode) : base(xmlNode) { } + + // positon of the section number from the left margin private LazyLoad _TofCSecNumPos; public float? TofCSecNumPos - { - get + { + get { return LazyLoad(ref _TofCSecNumPos, "@TofCSecNumPos"); - } + } } + // position of the section title from the left margin private LazyLoad _TofCSecTitlePos; public float? TofCSecTitlePos - { - get + { + get { return LazyLoad(ref _TofCSecTitlePos, "@TofCSecTitlePos"); } } + + // length of the section title before wrapping onto the next line private LazyLoad _TofCSecTitleLen; public int? TofCSecTitleLen - { - get + { + get { return LazyLoad(ref _TofCSecTitleLen, "@TofCSecTitleLen"); - } + } } + + // positon of the the section's starting page number private LazyLoad _TofCPageNumPos; public float? TofCPageNumPos - { - get + { + get { return LazyLoad(ref _TofCPageNumPos, "@TofCPageNumPos"); - } + } } + + // the character used for the spaces between the section title and the page number - i.e. leader dots private LazyLoad _TofCSpaceChar; public string TofCSpaceChar - { - get + { + get { return LazyLoad(ref _TofCSpaceChar, "@TofCSpaceChar"); - } + } } + + // the line spaces between each item on the table of contents private LazyLoad _TofCLineSpacing; public float? TofCLineSpacing - { - get + { + get { return LazyLoad(ref _TofCLineSpacing, "@TofCLineSpacing"); - } + } } + + // specify how many section / sub-sections to include on the TOC page private LazyLoad _TofCNumLevels; public int? TofCNumLevels { @@ -4980,6 +4382,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TofCNumLevels, "@TofCNumLevels"); } } + + // specify after which section level to start indenting the entries on the TOC page private LazyLoad _TofCStartIndentAfterLevel; public int? TofCStartIndentAfterLevel { @@ -4988,6 +4392,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TofCStartIndentAfterLevel, "@TofCStartIndentAfterLevel"); } } + + // flag to underline the first level section titles private LazyLoad _TofCUnderlineFirstLevelTitle; public bool TofCUnderlineFirstLevelTitle { @@ -4996,6 +4402,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TofCUnderlineFirstLevelTitle, "@TofCUnderlineFirstLevelTitle"); } } + + // specify the page number alignment with respect to the page number position - default is left justify private LazyLoad _TofCPageNumAlign; public string TofCPageNumAlign { @@ -5005,6 +4413,8 @@ namespace VEPROMS.CSLA.Library return (tocPgNumAlgn == null || tocPgNumAlgn == "") ? "Left" : tocPgNumAlgn; } } + + // a replacement section title for "Procedure Steps" - put in for V.C. Summer private LazyLoad _TofCProcedureStepsTitle; public string TofCProcedureStepsTitle { @@ -5014,6 +4424,8 @@ namespace VEPROMS.CSLA.Library return (tocProcStepsTitle == null || tocProcStepsTitle == "") ? "" : tocProcStepsTitle; } } + + // specify the line spacing to be just for the sub-sections entries private LazyLoad _TofCLineSpacingSub; public int? TofCLineSpacingSub { @@ -5022,6 +4434,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TofCLineSpacingSub, "@TofCLineSpacingSub"); } } + // if the Group Heading (defined in section's properties automation tab) is also part of the section number, + // remove it the Group Heading text from the section number - VEGP1, VEGP2 private LazyLoad _TofCRemoveGrpNameInSects; public bool TofCRemoveGrpNameInSects { @@ -5030,7 +4444,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TofCRemoveGrpNameInSects, "@TofCRemoveGrpNameInSects"); } } + // C2021-015: Barakah High Level Steps in Table of Contents + // if set in the Step Properties pannel private LazyLoad _TofCAllowHLS; public bool TofCAllowHLS { @@ -5044,15 +4460,18 @@ namespace VEPROMS.CSLA.Library { get { - return (_Font == null) ?_Font = new VE_Font(base.XmlNode):_Font; + return (_Font == null) ? _Font = new VE_Font(base.XmlNode) : _Font; } } } - #endregion + #endregion - TableOfContentsData + #region ConitnuousActionSummary public class ConitnuousActionSummaryData : vlnFormatItem { public ConitnuousActionSummaryData(XmlNode xmlNode) : base(xmlNode) { } + + // include the section number and title for the sections that contains continuous action steps private LazyLoad _IncludeSectionNumAndTitle; public bool IncludeSectionNumAndTitle { @@ -5061,6 +4480,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _IncludeSectionNumAndTitle, "@IncludeSectionNumAndTitle"); } } + // the font and font styles to use for the continuous action summary private VE_Font _Font; public VE_Font Font { @@ -5070,15 +4490,18 @@ namespace VEPROMS.CSLA.Library } } } - #endregion - #endregion + #endregion - ConitnuousActionSummary + #endregion - AccSectionDataAll + #region MetaSectionAll #region MetaSection [TypeConverter(typeof(ExpandableObjectConverter))] - public class MetaSection : vlnFormatItem,IVlnIndexedFormatItem + public class MetaSection : vlnFormatItem, IVlnIndexedFormatItem { public MetaSection(XmlNode xmlNode) : base(xmlNode) { } public MetaSection() : base() { } + + // represents the section level private LazyLoad _Index; public int? Index { @@ -5087,45 +4510,43 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Index, "@Index"); } } + // the column adjustment (indent) inwhich to print the section number for that level of section (sub-section) private LazyLoad _SecNumPositionAdj; public float? SecNumPositionAdj - { - get + { + get { return LazyLoad(ref _SecNumPositionAdj, "@SecNumPositionAdj"); - } + } } + + // the column adjustment (indent) inwhich to print the section title for that level of section (sub-section) private LazyLoad _SecTitlePositionAdj; public float? SecTitlePositionAdj - { - get + { + get { return LazyLoad(ref _SecTitlePositionAdj, "@SecTitlePositionAdj"); - } + } } + // adjustment (indent) for the high level steps for that level of section (sub-section) private LazyLoad _ColSByLevel; public float? ColSByLevel - { - get + { + get { return LazyLoad(ref _ColSByLevel, "@ColSByLevel"); - } - } - private LazyLoad _TofCPositionAdj; - public float? TofCPositionAdj - { - get - { - return LazyLoad(ref _TofCPositionAdj, "@TofCPositionAdj"); - } + } } + + // adjustment for the width of the high level steps for that level of section (sub-section) private LazyLoad _WidSAdjByLevel; public float? WidSAdjByLevel - { - get + { + get { return LazyLoad(ref _WidSAdjByLevel, "@WidSAdjByLevel"); - } + } } public override string GetPDDisplayName() { return string.Format("[{0}]", Index); } @@ -5133,16 +4554,17 @@ namespace VEPROMS.CSLA.Library { return "Meta Section Values"; } public override string ToString() { - return String.Format("{0}, {1}, {2}, {3}, {4}", SecNumPositionAdj, SecTitlePositionAdj, ColSByLevel, TofCPositionAdj, TofCPositionAdj); + return String.Format("{0}, {1}, {2}, {3}", SecNumPositionAdj, SecTitlePositionAdj, ColSByLevel, WidSAdjByLevel); } } - #endregion + #endregion - MetaSection + #region MetaSectionList [TypeConverter(typeof(vlnIndexedListConverter))] public class MetaSectionList : vlnIndexedFormatList { - public MetaSectionList(XmlNodeList xmlNodeList,IFormatOrFormatInfo myFormat) : base(xmlNodeList,myFormat) { } + public MetaSectionList(XmlNodeList xmlNodeList, IFormatOrFormatInfo myFormat) : base(xmlNodeList, myFormat) { } public override vlnIndexedFormatList InheritedList { get @@ -5153,18 +4575,19 @@ namespace VEPROMS.CSLA.Library return null; } } - - } - #endregion - #endregion - #endregion + #endregion - MetaSectionList + #endregion - MetaSectionAll + #endregion - SectDataAll + #region StepDataAll #region Step [TypeConverter(typeof(ExpandableObjectConverter))] - public class StepData : vlnFormatItem,IVlnIndexedFormatItem + public class StepData : vlnFormatItem, IVlnIndexedFormatItem { public StepData() : base() { } + + // translated to a step type number - this number is used to allow the BASE format settting in the Plant formats private LazyLoad _Index; [Description("Step Index")] public int? Index @@ -5174,14 +4597,17 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Index, "@Index"); } } + + // text description of the step part type (ex. High, Caution, Note) private LazyLoad _Type; public string Type - { - get + { + get { return LazyLoad(ref _Type, "@Type"); } } + // the step type from which settings are inherited private LazyLoad _ParentType; public string ParentType { @@ -5190,6 +4616,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ParentType, "@ParentType"); } } + // user cannot directly edit the text in step type - usually auto generated text like TITLEWITHTEXTBELOW used in background documents private LazyLoad _ReadOnly; public bool ReadOnly { @@ -5198,6 +4625,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ReadOnly, "@ReadOnly"); } } + + // Less space between text and bottom line of Caution Box private LazyLoad _NoYBxAdjust; // F2021-038: SHE/SHEA less space after top line & before bottom line public bool NoYBxAdjust { @@ -5206,7 +4635,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoYBxAdjust, "@NoYBxAdjust"); } } - //private LazyLoad _SeparateWarning; // KBR: To be used for Proms Express to separate out warnings from notes/cautions on ribbon, etc + //private LazyLoad _SeparateWarning; // KBR: To be used for Proms Express to separate out warnings from notes/cautions on ribbon, etc - NO CODE TO SUPPORT THIS YET AND IS NOT SET IN PROMS EXPRESS FORMATS //public bool SeparateWarning //{ // get @@ -5214,6 +4643,8 @@ namespace VEPROMS.CSLA.Library // return LazyLoad(ref _SeparateWarning, "@SeparateWarning"); // } //} + + // when set to Truen the step type will not appear in the insert step or sub-step lists. used to turn off (remove) the availability of step types that are not used or needed by the customer private LazyLoad _Inactive; public bool Inactive { @@ -5222,7 +4653,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Inactive, "@Inactive"); } } - // F2018-022 Added step type flag to append a ".0" to the end of the high level step - put in for Westinghouse single column format (wst1) + + // F2018-022 Added step type flag to append a ".0" to the end of the high level step + // - put in for Westinghouse single column format (wst1) + // - used when a high level step is used as a section number and title private LazyLoad _AppendDotZero; public bool AppendDotZero { @@ -5232,6 +4666,8 @@ namespace VEPROMS.CSLA.Library } } // F2019-069: Barakah Hold Point - set xoffset to parent's tab + // put in for BNPP (Barakah). the Hold Point (note type) needed indented the same as the high level step + // that it apples to, instead of centering it on the page like a normal Note type private LazyLoad _ColUseParentTab; public bool ColUseParentTab { @@ -5240,6 +4676,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ColUseParentTab, "@ColUseParentTab"); } } + + // this will override the ColS format setting for the specific step type private LazyLoad _ColOverride; public float? ColOverride { @@ -5248,17 +4686,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ColOverride, "@ColOverride"); } } - private LazyLoad _ColOverrideEdit; - public float? ColOverrideEdit - { - get - { - return LazyLoad(ref _ColOverrideEdit, "@ColOverrideEdit"); - } - } + // this will override the WidS format setting for the specific step type private LazyLoad _WidthOverride; - public string WidthOverride { get @@ -5266,49 +4696,42 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _WidthOverride, "@WidthOverride"); } } - //private LazyLoad _WidthOverride; - //public float? WidthOverride - //{ - // get - // { - // return LazyLoad(ref _WidthOverride, "@WidthOverride"); - // } - //} - private LazyLoad _WidthOverrideEdit; - - public float? WidthOverrideEdit + // Separtor text that is printed beween consecutive step items of this type + // ex: "-OR-" may be printed between two consecutive OR sub-step types + private LazyLoad _Sep; + public string Sep { get { - return LazyLoad(ref _WidthOverrideEdit, "@WidthOverrideEdit"); + return LazyLoad(ref _Sep, "@Sep"); } } - private LazyLoad _Sep; - public string Sep - { - get - { - return LazyLoad(ref _Sep, "@Sep"); - } - } + + // a text string that is placed before the text of this step type. + // Used in the Checklist formats to draw lines (for a table) when printed. + // Also used to add a step text designator character before step text private LazyLoad _Prefix; public string Prefix - { - get + { + get { return LazyLoad(ref _Prefix, "@Prefix"); } } + // a text string that is placed after the text of this step type. Used in the Checklist formats to draw lines (for a table) when printed. private LazyLoad _Suffix; public string Suffix - { - get + { + get { return LazyLoad(ref _Suffix, "@Suffix"); - } + } } + // F2019-069: Barakah Hold Point - allow for default text (for Barakah it is 'Hold Point') + //whenever this step type is added to a step, + //this text field will automatically be populated with this text private LazyLoad _DefaultText; public string DefaultText { @@ -5317,23 +4740,21 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _DefaultText, "@DefaultText"); } } - private LazyLoad _UnderlineTheseChar; - public string UnderlineTheseChar - { - get - { - return LazyLoad(ref _UnderlineTheseChar, "@UnderlineTheseChar"); - } - } + + // defines the positioning of the vertical table lines (to define columns). Used for the Checklist Formats which dymanically builds a table based on step and sub-step levels private LazyLoad _VertPos; public string VertPos - { - get + { + get { return LazyLoad(ref _VertPos, "@VertPos"); - } + } } - + // appears to be used for RNOs (step type 40) to control whether there are two blank lines or one line + // between the RNO steps. + // This needs set to true along with SpaceDouble in order for double spacing to happen. + // Default (BASE format) is set to True. + private LazyLoad _DoubleSpace; public bool DoubleSpace { @@ -5342,14 +4763,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _DoubleSpace, "@DoubleSpace"); } } - private LazyLoad _EnhancedStepNumFromPrev; - public bool EnhancedStepNumFromPrev - { - get - { - return LazyLoad(ref _EnhancedStepNumFromPrev, "@EnhancedStepNumFromPrev"); - } - } + + // If 'UseSmartTemplate' is True, the template (defined in FormatData.TPL) will have starting location & widths, + // and other data for the listed step types. Data from the template overrides width data as specified by + // the step type format data. private LazyLoad _UseSmartTemplate; public bool UseSmartTemplate { @@ -5358,7 +4775,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseSmartTemplate, "@UseSmartTemplate"); } } - + + // If 'UseOldTemplate' is True, the template (defined in FormatData.TPL) will define the sub-steps to + // automatically insert when this step is inserted in the procedure data. Mainly used by Enhanced Backgrounds + // and Deviations, but has been used in procedure step formats for specialized items private LazyLoad _UseOldTemplate; public bool UseOldTemplate { @@ -5367,6 +4787,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseOldTemplate, "@UseOldTemplate"); } } + + // appears to provide extra control as to when the STExtraSpace value is used for extra line spacing private LazyLoad _AlwaysUseExtraLines; public bool AlwaysUseExtraLines { @@ -5375,6 +4797,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AlwaysUseExtraLines, "@AlwaysUseExtraLines"); } } + // Used for Notes and Cautions that are boxed, create a separate box for each different Note and Caution type. private LazyLoad _SeparateBox; public bool SeparateBox { @@ -5383,6 +4806,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SeparateBox, "@SeparateBox"); } } + + // Used for Cautions that are boxed, create a separate box for each different Caution type. private LazyLoad _SeparateBoxCautions; public bool SeparateBoxCautions { @@ -5391,6 +4816,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SeparateBoxCautions, "@SeparateBoxCautions"); } } + // appears to be used for RNOs (step type 40) to control whether there are two blank lines or one between the RNO steps. This needs set to true along with DoubleSpace in order for double spacing to happen. Default (BASE format) is set to True. private LazyLoad _SpaceDouble; public bool SpaceDouble { @@ -5399,22 +4825,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpaceDouble, "@SpaceDouble"); } } - private LazyLoad _ReduceLineAfter; - public bool ReduceLineAfter - { - get - { - return LazyLoad(ref _ReduceLineAfter, "@ReduceLineAfter"); - } - } - private LazyLoad _SameLevel; - public bool SameLevel - { - get - { - return LazyLoad(ref _SameLevel, "@SameLevel"); - } - } + + // This will bold the High Level RNO text - whether the high level step is bolded or not (code doesn't check for that) - this is only set on the RNO step type private LazyLoad _BoldHighLevel; public bool BoldHighLevel { @@ -5423,6 +4835,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BoldHighLevel, "@BoldHighLevel"); } } + + // used on Note and Caution types, will put an extra blank line before the Note or Caution tab private LazyLoad _OneLineBeforeTab; public bool OneLineBeforeTab { @@ -5431,14 +4845,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _OneLineBeforeTab, "@OneLineBeforeTab"); } } - private LazyLoad _CheckOffOnAllSteps; - public bool CheckOffOnAllSteps - { - get - { - return LazyLoad(ref _CheckOffOnAllSteps, "@CheckOffOnAllSteps"); - } - } + + // Turns on the boxing of an entire step (usually LossOfAC high level step type) private LazyLoad _BoxIt; public bool BoxIt { @@ -5447,38 +4855,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BoxIt, "@BoxIt"); } } - private LazyLoad _Boxed; - public bool Boxed - { - get - { - return LazyLoad(ref _Boxed, "@Boxed"); - } - } - private LazyLoad _XLines_StepFix; - public bool XLines_StepFix - { - get - { - return LazyLoad(ref _XLines_StepFix, "@XLines_StepFix"); - } - } - private LazyLoad _Rebox; - public bool Rebox - { - get - { - return LazyLoad(ref _Rebox, "@Rebox"); - } - } - private LazyLoad _SpcHdr; - public bool SpcHdr - { - get - { - return LazyLoad(ref _SpcHdr, "@SpcHdr"); - } - } + + // only put a bottom continue message if we are breaking on an RNO step. + // this flag is set only on the RNO (index 40) step type private LazyLoad _ContinueOnly; public bool ContinueOnly { @@ -5487,22 +4866,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ContinueOnly, "@ContinueOnly"); } } - private LazyLoad _SepAfterAER; - public bool SepAfterAER - { - get - { - return LazyLoad(ref _SepAfterAER, "@SepAfterAER"); - } - } - private LazyLoad _UseAlternateStepBox; - public bool UseAlternateStepBox - { - get - { - return LazyLoad(ref _UseAlternateStepBox, "@UseAlternateStepBox"); - } - } + + // underline the text that follows a "- " for this step type private LazyLoad _UnderlineAfterDashSpace; public bool UnderlineAfterDashSpace { @@ -5511,6 +4876,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UnderlineAfterDashSpace, "@UnderlineAfterDashSpace"); } } + // F2019-065: Allow uppercase of high level steps to be defined in the format private LazyLoad _UpperCase; public bool UpperCase @@ -5520,6 +4886,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UpperCase, "@UpperCase"); } } + + // this is applied to Caution and Note step types. + // When set, it will add an extra blank line for cases where the top of the page is a boxed caution or note + // - to move it away from the top page border line private LazyLoad _SpaceIn; public bool SpaceIn { @@ -5528,6 +4898,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpaceIn, "@SpaceIn"); } } + + // Each step of this type will alway start on a new page. This is used background formats. private LazyLoad _PageBreakOnStep; public bool PageBreakOnStep { @@ -5536,6 +4908,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PageBreakOnStep, "@PageBreakOnStep"); } } + // if there is no section number defined for the step section and the section title is printed on the page (using the check box on section properties), then align the procedure step tab to the same starting column as the section title private LazyLoad _AlignNullTabWSectHead; public bool AlignNullTabWSectHead { @@ -5544,6 +4917,11 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AlignNullTabWSectHead, "@AlignNullTabWSectHead"); } } + + // For Calvert Cliffs (BGE formats), when AlignNullTabWSectHead is used in BGEEOP (see EOP-0/Purpose ), + // it caused BGESTP's to print LossOfAC steps (unnumbered HLS) too far to the left. + // The ForceAlignNullTabWSectHead was introduced so that for that step type (LossOfAC) in STP/OI format + // so that the title position was used instead of the section number position private LazyLoad _ForceAlignNullTabWSectHead; public bool ForceAlignNullTabWSectHead { @@ -5552,6 +4930,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ForceAlignNullTabWSectHead, "@ForceAlignNullTabWSectHead"); } } + + // force the alignment of the high level step tab with the section title private LazyLoad _AlignHLSTabWithSectOvride; public bool AlignHLSTabWithSectOvride { @@ -5560,6 +4940,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AlignHLSTabWithSectOvride, "@AlignHLSTabWithSectOvride"); } } + + // set on selected sub-step types, allows sub-steps to use the type attributes of a Note or Caution that they are a part off private LazyLoad _TextSubFollowsTextStyle; public bool TextSubFollowsTextStyle { @@ -5568,6 +4950,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TextSubFollowsTextStyle, "@TextSubFollowsTextStyle"); } } + + // Additional indenting (spaces) to use when the sub-step type is inside a caution or note type private LazyLoad _CautionOrNoteSubstepIndent; public int? CautionOrNoteSubstepIndent { @@ -5576,14 +4960,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CautionOrNoteSubstepIndent, "@CautionOrNoteSubstepIndent"); } } - private LazyLoad _TreatAsSequential; - public bool TreatAsSequential - { - get - { - return LazyLoad(ref _TreatAsSequential, "@TreatAsSequential"); - } - } + + // adjust the placement of a Caution or Note when it's in an RNO and is not off of the high level RNO (adds another blank line) private LazyLoad _MatchUpRNO; public bool MatchUpRNO { @@ -5592,6 +4970,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _MatchUpRNO, "@MatchUpRNO"); } } + + // used for Background formats - tell PROMS that the text for this step type is printed via the pagelist (PageStyle) logic as part of the page header information private LazyLoad _InPageList; public bool InPageList { @@ -5600,6 +4980,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _InPageList, "@InPageList"); } } + + // will center the text within the defined step type width if the text length is shorter than the step type width. + // Used on the Note and Caution step types private LazyLoad _CenterOneLineOnly; public bool CenterOneLineOnly { @@ -5608,6 +4991,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CenterOneLineOnly, "@CenterOneLineOnly"); } } + // used with CenterOneLineOnly, will not center the single line note/caution text if it as sub-steps private LazyLoad _CenterOnlyIfNoSubs; public bool CenterOnlyIfNoSubs { @@ -5616,7 +5000,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CenterOnlyIfNoSubs, "@CenterOnlyIfNoSubs"); } } + // F2021-042: Added FormatStepData.AlwaysCenter for BNPP1 - Critical Step text always must be centered + // step type is always centered on the page private LazyLoad _AlwaysCenter; public bool AlwaysCenter { @@ -5625,22 +5011,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AlwaysCenter, "@AlwaysCenter"); } } - private LazyLoad _SubTableGetsUp1Level; - public bool SubTableGetsUp1Level - { - get - { - return LazyLoad(ref _SubTableGetsUp1Level, "@SubTableGetsUp1Level"); - } - } - private LazyLoad _Remember; - public bool Remember - { - get - { - return LazyLoad(ref _Remember, "@Remember"); - } - } + + // additional logic to better center single line Notes and Cautions that are used in the RNO column private LazyLoad _CenterOneLineAdjust; public bool CenterOneLineAdjust { @@ -5649,62 +5021,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CenterOneLineAdjust, "@CenterOneLineAdjust"); } } - private LazyLoad _Break; - public bool Break - { - get - { - return LazyLoad(ref _Break, "@Break"); - } - } - private LazyLoad _BreakEquipmentList; - public bool BreakEquipmentList - { - get - { - return LazyLoad(ref _BreakEquipmentList, "@BreakEquipmentList"); - } - } - private LazyLoad _BreakCautionsNotesOnSubstps; - public bool BreakCautionsNotesOnSubstps - { - get - { - return LazyLoad(ref _BreakCautionsNotesOnSubstps, "@BreakCautionsNotesOnSubstps"); - } - } - private LazyLoad _CenterTextWithinWidth; - public bool CenterTextWithinWidth - { - get - { - return LazyLoad(ref _CenterTextWithinWidth, "@CenterTextWithinWidth"); - } - } - private LazyLoad _NewlineAfter; - public bool NewlineAfter - { - get - { - return LazyLoad(ref _NewlineAfter, "@NewlineAfter"); - } - } - private LazyLoad _StartLineWithDash; - public bool StartLineWithDash - { - get - { - return LazyLoad(ref _StartLineWithDash, "@StartLineWithDash"); - } - } - private LazyLoad _BlankLineBeforeSubStep; - public bool BlankLineBeforeSubStep - { - get - { - return LazyLoad(ref _BlankLineBeforeSubStep, "@BlankLineBeforeSubStep"); - } - } + + // used on Caution and Note step types, for steps that have multiple Cautions and/or Notes, + // this will put the Caution or Note tab for each of them private LazyLoad _AlwaysTab; public bool AlwaysTab { @@ -5713,6 +5032,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AlwaysTab, "@AlwaysTab"); } } + + // Don't put a blank line between multiple RNOs private LazyLoad _NoSpaceMultipleRNOs; public bool NoSpaceMultipleRNOs { @@ -5721,6 +5042,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoSpaceMultipleRNOs, "@NoSpaceMultipleRNOs"); } } + + // allows cautions type to be changed to notes and notes changed to cautions private LazyLoad _MixCautionsAndNotes; public bool MixCautionsAndNotes { @@ -5729,6 +5052,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _MixCautionsAndNotes, "@MixCautionsAndNotes"); } } + + // set on the RNO step type, will grab and use the high level step's tab for the RNO private LazyLoad _NumberHighLevel; public bool NumberHighLevel { @@ -5737,6 +5062,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NumberHighLevel, "@NumberHighLevel"); } } + + // set on RNO step types, determines the RNO tab base on the RNO level private LazyLoad _NumberWithLevel; public bool NumberWithLevel { @@ -5745,6 +5072,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NumberWithLevel, "@NumberWithLevel"); } } + + // default is set to True. If set to False, then only the high level RNO step + // will use the high level step's tab (used with the NumberHighLevel format flag) private LazyLoad _OffsetTab; public bool OffsetTab { @@ -5753,6 +5083,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _OffsetTab, "@OffsetTab"); } } + + // put in for Farley, value to adjust the xoffset of the step tab based on where the right edge of the text is. + // Their RNO's are numbered with parent numbering so the calculations for determining + // the xoffset backs up from the right edge. private LazyLoad _AdjHighLevelTab; public float? AdjHighLevelTab { @@ -5761,6 +5095,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AdjHighLevelTab, "@AdjHighLevelTab"); } } + // sets an indent value for child steps (sub-steps) under the TitleWithTextBelow step type private LazyLoad _ChildIndent; public float? ChildIndent { @@ -5769,30 +5104,11 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ChildIndent, "@ChildIndent"); } } - private LazyLoad _LeftJustifyBorderless; - public bool LeftJustifyBorderless - { - get - { - return LazyLoad(ref _LeftJustifyBorderless, "@LeftJustifyBorderless"); - } - } - private LazyLoad _StepNumIfOnlyOne; - public bool StepNumIfOnlyOne - { - get - { - return LazyLoad(ref _StepNumIfOnlyOne, "@StepNumIfOnlyOne"); - } - } - private LazyLoad _LJTabs; - public bool LJTabs - { - get - { - return LazyLoad(ref _LJTabs, "@LJTabs"); - } - } + + // RNO's off of sequential sub-steps will get the parent's (AER sub-step) tab + // - BASE format has this set to True and is set on RNO step type. + // NSP (Prairie Island) has this set to False in some of their formats to allow + // the RNO sub-step type to be use as a signoff/initial line private LazyLoad _NumberSubs; public bool NumberSubs { @@ -5801,22 +5117,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NumberSubs, "@NumberSubs"); } } - private LazyLoad _BulletOnContinuous; - public bool BulletOnContinuous - { - get - { - return LazyLoad(ref _BulletOnContinuous, "@BulletOnContinuous"); - } - } - private LazyLoad _StepNumberForHighLevel; - public bool StepNumberForHighLevel - { - get - { - return LazyLoad(ref _StepNumberForHighLevel, "@StepNumberForHighLevel"); - } - } + + // used in some background document formats - all appear to be set on a Caution type. + // This will place the text of this type (caution) on the same row (of the page) and to the left of its parent. + // Is also used as a step designatior for Commanche Peak private LazyLoad _SameRowAsParent; public bool SameRowAsParent { @@ -5825,6 +5129,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SameRowAsParent, "@SameRowAsParent"); } } + + // Used in Comanche Peak EOP and Flex formats for step designators. Will allow a hard return to be used for multiple step designators. private LazyLoad _SameRowAsParentMultiLines; public bool SameRowAsParentMultiLines { @@ -5833,6 +5139,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SameRowAsParentMultiLines, "@SameRowAsParentMultiLines"); } } + // is set to False in BASE format (not set to True in any other format as of 2024Jun21). When set to False, we disable the ability to enter another Checkoff in an RNO part if the the parent RNO already has a checkoff set. private LazyLoad _CheckOffSameAsParent; public bool CheckOffSameAsParent { @@ -5841,6 +5148,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CheckOffSameAsParent, "@CheckOffSameAsParent"); } } + + // pad the step number so that is has at least two digits (ex step 1 would be step 01) private LazyLoad _AtLeastTwoDigits; public bool AtLeastTwoDigits { @@ -5849,22 +5158,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AtLeastTwoDigits, "@AtLeastTwoDigits"); } } - private LazyLoad _UseInAcTable; - public bool UseInAcTable - { - get - { - return LazyLoad(ref _UseInAcTable, "@UseInAcTable"); - } - } - private LazyLoad _Number; - public bool Number - { - get - { - return LazyLoad(ref _Number, "@Number"); - } - } + + // Put three blank line before this step type (when printed) private LazyLoad _ThreeBlanksAbove; public bool ThreeBlanksAbove { @@ -5873,58 +5168,43 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ThreeBlanksAbove, "@ThreeBlanksAbove"); } } - private LazyLoad _CheckOffs; - public bool CheckOffs - { - get - { - return LazyLoad(ref _CheckOffs, "@CheckOffs"); - } - } - private LazyLoad _Quoted; - public bool Quoted - { - get - { - return LazyLoad(ref _Quoted, "@Quoted"); - } - } - private VE_Font GetUCFFontAsVE_Font() - { - // if formatconfig & step list, then go through to see if index exists, if so and if there is a font, use it: - if (MyFormat.PlantFormat.FormatConfig != null && MyFormat.PlantFormat.FormatConfig.PlantFormat != null && MyFormat.PlantFormat.FormatConfig.PlantFormat.FormatData != null && MyFormat.PlantFormat.FormatConfig.PlantFormat.FormatData.StepData != null) - { - foreach (FormatConfig.Step stp in MyFormat.PlantFormat.FormatConfig.PlantFormat.FormatData.StepData) - { - if (Convert.ToInt32(stp.Index) == (int)Index && stp.FontDesc != null && stp.FontDesc.Font != null && stp.FontDesc.Font != "") - { - System.Drawing.FontConverter cvt = new System.Drawing.FontConverter(); - System.Drawing.Font windowsFont = cvt.ConvertFromString(stp.FontDesc.Font) as System.Drawing.Font; - E_Style myStyle = E_Style.None; - if (windowsFont.Bold) myStyle |= E_Style.Bold; - if (windowsFont.Underline) myStyle |= E_Style.Underline; - if (windowsFont.Italic) myStyle |= E_Style.Italics; - return (new VE_Font(windowsFont.Name, (int)windowsFont.Size, myStyle, windowsFont.SizeInPoints)); - } - } - } - return null; - } + private VE_Font GetUCFFontAsVE_Font() + { + // if formatconfig & step list, then go through to see if index exists, if so and if there is a font, use it: + if (MyFormat.PlantFormat.FormatConfig != null && MyFormat.PlantFormat.FormatConfig.PlantFormat != null && MyFormat.PlantFormat.FormatConfig.PlantFormat.FormatData != null && MyFormat.PlantFormat.FormatConfig.PlantFormat.FormatData.StepData != null) + { + foreach (FormatConfig.Step stp in MyFormat.PlantFormat.FormatConfig.PlantFormat.FormatData.StepData) + { + if (Convert.ToInt32(stp.Index) == (int)Index && stp.FontDesc != null && stp.FontDesc.Font != null && stp.FontDesc.Font != "") + { + System.Drawing.FontConverter cvt = new System.Drawing.FontConverter(); + System.Drawing.Font windowsFont = cvt.ConvertFromString(stp.FontDesc.Font) as System.Drawing.Font; + + E_Style myStyle = E_Style.None; + if (windowsFont.Bold) myStyle |= E_Style.Bold; + if (windowsFont.Underline) myStyle |= E_Style.Underline; + if (windowsFont.Italic) myStyle |= E_Style.Italics; + return (new VE_Font(windowsFont.Name, (int)windowsFont.Size, myStyle, windowsFont.SizeInPoints)); + } + } + } + return null; + } private VE_Font _Font; public VE_Font Font { get { - if (PlantFormat.IgnoreUCF) return (_Font == null) ?_Font = new VE_Font(base.XmlNode): _Font; - if (_Font != null) return (_Font); - VE_Font vef = GetUCFFontAsVE_Font(); - if (vef != null) - { - _Font = vef; - return vef; - } - return (_Font == null) ?_Font = new VE_Font(base.XmlNode): _Font; + if (PlantFormat.IgnoreUCF) return (_Font == null) ? _Font = new VE_Font(base.XmlNode) : _Font; + if (_Font != null) return (_Font); + VE_Font vef = GetUCFFontAsVE_Font(); + if (vef != null) + { + _Font = vef; + return vef; + } + return (_Font == null) ? _Font = new VE_Font(base.XmlNode) : _Font; } } private StepLayoutData _StepLayoutData; @@ -5932,7 +5212,7 @@ namespace VEPROMS.CSLA.Library { get { - return (_StepLayoutData == null)? _StepLayoutData = new StepLayoutData(base.XmlNode): _StepLayoutData; + return (_StepLayoutData == null) ? _StepLayoutData = new StepLayoutData(base.XmlNode) : _StepLayoutData; } } private StepEditData _StepEditData; @@ -5963,6 +5243,11 @@ namespace VEPROMS.CSLA.Library { return string.Format("{0}", Type); } + + // by default, all continuous action steps and sub-steps are included in the PROMS generated + // continuous Action Summary. Not all formats (plants) use dedicated continuous action steps and sub-steps + // and sometimes these step type are redefined for other purposes. + // Setting this to True will exclude this step type from the Continuouse Action Summary. private LazyLoad _ExcludeFromContActSum; public bool ExcludeFromContActSum { @@ -5972,6 +5257,7 @@ namespace VEPROMS.CSLA.Library } } //F2022-024 Time Critical Action Step + //By default, Time Critical Action steps are included on the PROMS generated Time Critical Action Summary. Setting this to True will not automatically include it on the Time Critical Action Summary. private LazyLoad _ExcludeFromTimeCriticalActSum; public bool ExcludeFromTimeCriticalActSum { @@ -5982,237 +5268,237 @@ namespace VEPROMS.CSLA.Library } } - #endregion - #region StepDataList - [TypeConverter(typeof(vlnIndexedListConverter))] - public class StepDataList : vlnIndexedFormatList +#endregion +#region StepDataList +[TypeConverter(typeof(vlnIndexedListConverter))] +public class StepDataList : vlnIndexedFormatList +{ +//public new StepData this[int index] +//{ +// get +// { +// foreach (StepData stepData in this) +// if (stepData.Index == index) return stepData; +// return null; +// } +//} +public override vlnIndexedFormatList InheritedList +{ + get { - //public new StepData this[int index] - //{ - // get - // { - // foreach (StepData stepData in this) - // if (stepData.Index == index) return stepData; - // return null; - // } - //} - public override vlnIndexedFormatList InheritedList - { - get - { - IFormatOrFormatInfo parentFormat = MyFormat.MyIParent; - if (parentFormat != null) - return parentFormat.PlantFormat.FormatData.StepDataList; - return null; - } - } - public StepData this[string type] - { - get - { - foreach (StepData stepData in this) - if (stepData.Type == type) return stepData; - StepDataList ttlParent = (StepDataList) InheritedList; //Check Inherited Value - if (ttlParent != null) - return ttlParent[type]; // note that this is recursive, i.e. if doesn't get found in parent, goes to parent's parent. - return null; - } - } - // the following was commented out because it uses the vlnFormat version of the code that indexes the list. - //public StepData this[int index] - //{ - // get - // { - // foreach (StepData stepData in this) - // if (stepData.Index == index) return stepData; - // StepDataList ttlParent = (StepDataList)InheritedList; //Check Inherited Value - // if (ttlParent != null) - // return ttlParent[index]; - // return null; - // } - //} - public StepDataList(XmlNodeList xmlNodeList, IFormatOrFormatInfo myFormat) : base(xmlNodeList, myFormat) { } - private StepData _HLS; - public StepData HLS - { - get - { - if (_HLS!=null) return _HLS; - foreach (StepData sd in this) - { - if (sd.Type == "High") - { - _HLS = sd; - return sd; - } - } - return null; - } - } - private StepData _Caution; - public StepData Caution - { - get - { - if (_Caution != null) return _Caution; - foreach (StepData sd in this) - { - if (sd.Type == "Caution") - { - _Caution = sd; - return sd; - } - } - return null; - } - } - private StepData _Note; - public StepData Note - { - get - { - if (_Note != null) return _Note; - foreach (StepData sd in this) - { - if (sd.Type == "Note") - { - _Note = sd; - return sd; - } - } - return null; - } - } - private StepData _RNO; - public StepData RNO - { - get - { - if (_RNO != null) return _RNO; - foreach (StepData sd in this) - { - if (sd.Type == "RNOType") - { - _RNO = sd; - return sd; - } - } - return null; - } - } - private StepData _Fig; - public StepData Fig - { - get - { - if (_Fig != null) return _Fig; - foreach (StepData sd in this) - { - if (sd.Type == "Figure") - { - _Fig = sd; - return sd; - } - } - return null; - } - } - private StepData _Table; - public StepData Table - { - get - { - if (_Table != null) return _Table; - foreach (StepData sd in this) - { - if (sd.Type == "Table") - { - _Table = sd; - return sd; - } - } - return null; - } - } - private StepData _Substep; - public StepData Substep - { - get - { - if (_Substep != null) return _Substep; - foreach (StepData sd in this) - { - if (sd.Type == "Substep") - { - _Substep = sd; - return sd; - } - } - return null; - } - } - // EmbeddedObject has been commented out, 'Equations' are separate top level items. - // This code was left here in case Equations , and other OLE objects, end up - // under the EmbeddedObject: - - // EmbeddedObject has inheritted types that represent OLE objects. - // The first of these is 'Equation'. Another that may be implemented later is Image. - // This is a special case, since only 'Equation' exists on initial development of - // embedded objects, 'skip' the embedded object layer when creating the list and - // go right to the equations. - //private StepData _EmbeddedObject; - //public StepData EmbeddedObject - //{ - // get - // { - // if (_EmbeddedObject != null) return _EmbeddedObject; - // foreach (StepData sd in this) - // { - // if (sd.Type == "EmbeddedObject") - // { - // _Equation = sd; - // return sd; - // } - // } - // return null; - // } - //} - private StepData _Equation; - public StepData Equation // equation has a parent of embedded object. - { - get - { - if (_Equation != null) return _Equation; - foreach (StepData sd in this) - { - if (sd.Type == "Equation") - { - _Equation = sd; - return sd; - } - } - // Handle inheritance (step data may not be in current format, may inherit from parents): - IFormatOrFormatInfo parentFormat = this.MyFormat.PlantFormat.FormatData.MyParentFormat; - while (parentFormat != null) - { - vlnIndexedFormatList InheritedList = parentFormat.PlantFormat.FormatData.StepDataList; - if (InheritedList != null) - { - foreach (StepData sdi in InheritedList) - { - if (sdi.Type == "Equation") - { - _Equation = sdi; - return sdi; - } - } - } - parentFormat = parentFormat.PlantFormat.FormatData.MyParentFormat; - } - return null; - } - } + IFormatOrFormatInfo parentFormat = MyFormat.MyIParent; + if (parentFormat != null) + return parentFormat.PlantFormat.FormatData.StepDataList; + return null; } +} +public StepData this[string type] +{ + get + { + foreach (StepData stepData in this) + if (stepData.Type == type) return stepData; + StepDataList ttlParent = (StepDataList) InheritedList; //Check Inherited Value + if (ttlParent != null) + return ttlParent[type]; // note that this is recursive, i.e. if doesn't get found in parent, goes to parent's parent. + return null; + } +} +// the following was commented out because it uses the vlnFormat version of the code that indexes the list. +//public StepData this[int index] +//{ +// get +// { +// foreach (StepData stepData in this) +// if (stepData.Index == index) return stepData; +// StepDataList ttlParent = (StepDataList)InheritedList; //Check Inherited Value +// if (ttlParent != null) +// return ttlParent[index]; +// return null; +// } +//} +public StepDataList(XmlNodeList xmlNodeList, IFormatOrFormatInfo myFormat) : base(xmlNodeList, myFormat) { } +private StepData _HLS; +public StepData HLS +{ + get + { + if (_HLS!=null) return _HLS; + foreach (StepData sd in this) + { + if (sd.Type == "High") + { + _HLS = sd; + return sd; + } + } + return null; + } +} +private StepData _Caution; +public StepData Caution +{ + get + { + if (_Caution != null) return _Caution; + foreach (StepData sd in this) + { + if (sd.Type == "Caution") + { + _Caution = sd; + return sd; + } + } + return null; + } +} +private StepData _Note; +public StepData Note +{ + get + { + if (_Note != null) return _Note; + foreach (StepData sd in this) + { + if (sd.Type == "Note") + { + _Note = sd; + return sd; + } + } + return null; + } +} +private StepData _RNO; +public StepData RNO +{ + get + { + if (_RNO != null) return _RNO; + foreach (StepData sd in this) + { + if (sd.Type == "RNOType") + { + _RNO = sd; + return sd; + } + } + return null; + } +} +private StepData _Fig; +public StepData Fig +{ + get + { + if (_Fig != null) return _Fig; + foreach (StepData sd in this) + { + if (sd.Type == "Figure") + { + _Fig = sd; + return sd; + } + } + return null; + } +} +private StepData _Table; +public StepData Table +{ + get + { + if (_Table != null) return _Table; + foreach (StepData sd in this) + { + if (sd.Type == "Table") + { + _Table = sd; + return sd; + } + } + return null; + } +} +private StepData _Substep; +public StepData Substep +{ + get + { + if (_Substep != null) return _Substep; + foreach (StepData sd in this) + { + if (sd.Type == "Substep") + { + _Substep = sd; + return sd; + } + } + return null; + } +} +// EmbeddedObject has been commented out, 'Equations' are separate top level items. +// This code was left here in case Equations , and other OLE objects, end up +// under the EmbeddedObject: + +// EmbeddedObject has inheritted types that represent OLE objects. +// The first of these is 'Equation'. Another that may be implemented later is Image. +// This is a special case, since only 'Equation' exists on initial development of +// embedded objects, 'skip' the embedded object layer when creating the list and +// go right to the equations. +//private StepData _EmbeddedObject; +//public StepData EmbeddedObject +//{ +// get +// { +// if (_EmbeddedObject != null) return _EmbeddedObject; +// foreach (StepData sd in this) +// { +// if (sd.Type == "EmbeddedObject") +// { +// _Equation = sd; +// return sd; +// } +// } +// return null; +// } +//} +private StepData _Equation; +public StepData Equation // equation has a parent of embedded object. +{ + get + { + if (_Equation != null) return _Equation; + foreach (StepData sd in this) + { + if (sd.Type == "Equation") + { + _Equation = sd; + return sd; + } + } + // Handle inheritance (step data may not be in current format, may inherit from parents): + IFormatOrFormatInfo parentFormat = this.MyFormat.PlantFormat.FormatData.MyParentFormat; + while (parentFormat != null) + { + vlnIndexedFormatList InheritedList = parentFormat.PlantFormat.FormatData.StepDataList; + if (InheritedList != null) + { + foreach (StepData sdi in InheritedList) + { + if (sdi.Type == "Equation") + { + _Equation = sdi; + return sdi; + } + } + } + parentFormat = parentFormat.PlantFormat.FormatData.MyParentFormat; + } + return null; + } +} +} #endregion #region StepLayoutData [TypeConverter(typeof(ExpandableObjectConverter))] @@ -6222,22 +5508,8 @@ namespace VEPROMS.CSLA.Library : base(xmlNode) { } - private LazyLoad _ForeColor; - public string ForeColor - { - get - { - return LazyLoad(ref _ForeColor, "StepLayoutData/@ForeColor"); - } - } - private LazyLoad _BackColor; - public string BackColor - { - get - { - return LazyLoad(ref _BackColor, "StepLayoutData/@BackColor"); - } - } + + // add extra spacing before this step type private LazyLoad _STExtraSpace; public int? STExtraSpace { @@ -6246,6 +5518,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _STExtraSpace, "StepLayoutData/@STExtraSpace"); } } + + // the number referencing the definition of a box around that step type - used for Caution and Note boxes private LazyLoad _STBoxindex; public int? STBoxindex { @@ -6254,6 +5528,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _STBoxindex, "StepLayoutData/@STBoxindex"); } } + + // will add a blank line after every N number of items private LazyLoad _EveryNLines; public int? EveryNLines { @@ -6262,6 +5538,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _EveryNLines, "StepLayoutData/@EveryNLines"); } } + + // position the step item to start in the same column as it's parent private LazyLoad _AlignWithParentTab; public bool AlignWithParentTab { @@ -6289,22 +5567,8 @@ namespace VEPROMS.CSLA.Library return (_TypeMenu == null) ? _TypeMenu = new TypeMenu(base.XmlNode) : _TypeMenu; } } - private LazyLoad _ForeColor; - public string ForeColor - { - get - { - return LazyLoad(ref _ForeColor, "StepEditData/@ForeColor"); - } - } - private LazyLoad _BackColor; - public string BackColor - { - get - { - return LazyLoad(ref _BackColor, "StepEditData/@BackColor"); - } - } + + // list of actions defining what can be added to this step type (ex. addingNext, addingPrev, addingNote, addingCaution, addingTable) private LazyLoad _AcTable; public E_AccStep? AcTable { @@ -6313,6 +5577,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AcTable, "StepEditData/@AcTable"); } } + // specify if this step type can be selected in the PROMS Search module private LazyLoad _Searchable; public bool Searchable { @@ -6323,6 +5588,7 @@ namespace VEPROMS.CSLA.Library } } #endregion + #region StepPrintData [TypeConverter(typeof(ExpandableObjectConverter))] public class StepPrintData : vlnFormatItem @@ -6331,6 +5597,7 @@ namespace VEPROMS.CSLA.Library : base(xmlNode) { } + // allows a Horizontal adjustment (the tab and the text) of the step type when printed private LazyLoad _PosAdjust; public float? PosAdjust { @@ -6339,6 +5606,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PosAdjust, "StepPrintData/@PosAdjust"); } } + + // when printing, if this HLS uses a smart template (checklist formats) this value is used to determine when to split across 2 lines private LazyLoad _HLSLength; public int? HLSLength { @@ -6347,6 +5616,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _HLSLength, "StepPrintData/@HLSLength"); } } + // used to set the text justification when it is something other than Left Justified private LazyLoad _Justify; public string Justify { @@ -6355,6 +5625,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Justify, "StepPrintData/@Justify"); } } + // B2022-003: BNPP Alarms (BNPPalr) - This will add a blank line after the sub of the sub-step private LazyLoad _BlankAfterSubWithSub; public bool BlankAfterSubWithSub // B2022-003: BNPP Alarms (BNPPalr) - incorrect line spacing for substeps off substeps. { @@ -6365,6 +5636,7 @@ namespace VEPROMS.CSLA.Library } } #endregion + #region TypeMenu [TypeConverter(typeof(ExpandableObjectConverter))] public class TypeMenu : vlnFormatItem @@ -6373,6 +5645,7 @@ namespace VEPROMS.CSLA.Library : base(xmlNode) { } + // This controls whether or not a step or sub-step type appears in the Insert and Search options for the user to select private LazyLoad _InMenu; public bool InMenu { @@ -6381,6 +5654,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _InMenu, "StepEditData/TypeMenu/@InMenu"); } } + // RNOs are a specal case. This controls whether or not a RNO type appears in the Insert and Search options for the user to select private LazyLoad _RnoInMenu; public bool RnoInMenu { @@ -6389,6 +5663,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RnoInMenu, "StepEditData/TypeMenu/@RnoInMenu"); } } + + // The name of the step/sub-step type that appears in step/substep menus and lists. + // This allows us to override the default name private LazyLoad _MenuItem; public string MenuItem { @@ -6397,6 +5674,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _MenuItem, "StepEditData/TypeMenu/@MenuItem"); } } + + // used to define an alternative menu name for when the sub-step type is used in an RNO (right column) private LazyLoad _RnoMenuItem; public string RnoMenuItem { @@ -6405,6 +5684,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RnoMenuItem, "StepEditData/TypeMenu/@RnoMenuItem"); } } + // text to appear for the reason why a step/sub-step type cannot be changed private LazyLoad _NoChgReason; public string NoChgReason { @@ -6413,6 +5693,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoChgReason, "StepEditData/TypeMenu/@NoChgReason"); } } + // use with the Caution and Note sub-step types - specifes which other Cautions and Note types the current Caution or Note could be changed to via Step Properties private LazyLoad _AlternateNameList; public string AlternateNameList { @@ -6428,6 +5709,10 @@ namespace VEPROMS.CSLA.Library public class Bullet : vlnFormatItem { public Bullet(XmlNode xmlNode) : base(xmlNode) { } + + // Pairie Island (NSP) Caution and Note tabs use a larger font + // - When using a bullet for multiple Cautions/Notes, use the font size of the Caution/Note text instead of the tab. + // all the formats that use this specify the font and font size the the Font setting (below) private LazyLoad _Separate; public bool Separate { @@ -6436,6 +5721,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Separate, "TabData/Bullet/@Separate"); } } + // defines a font to use for the bullet character private VE_Font _Font; public VE_Font Font { @@ -6460,6 +5746,8 @@ namespace VEPROMS.CSLA.Library : base(xmlNode) { } + + // list of one or more print macros to print with the step tab (used for a checkoff or inital line next to step number) private MacroList _MacroList; public MacroList MacroList { @@ -6468,6 +5756,8 @@ namespace VEPROMS.CSLA.Library return _MacroList == null ? _MacroList = new MacroList(SelectNodes("TabData/MacroList/Macro")) : _MacroList; } } + + // Used to define a designator character to appear in the Step Editor for when the printed character is a macro // F2022-024 used with the Time Critial Step type (used in Robinson EOP/AOP format) // this will put the character asigned in the Time Critial Step format defination next to the step tab on the edit screen // When this step is printed, a macro named Clock (genmac format file) is used instead to print a clock symbol @@ -6479,6 +5769,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _MacroEditTag, "TabData/@MacroEditTag"); } } + + // defines the formatting of the step tab on the edit screen private LazyLoad _IdentEdit; public string IdentEdit { @@ -6487,6 +5779,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _IdentEdit, "TabData/@IdentEdit"); } } + // defines the formatting of the step tab when printed private LazyLoad _IdentPrint; public string IdentPrint { @@ -6495,6 +5788,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _IdentPrint, "TabData/@Ident"); } } + + // used in background document formats - allows us to put the step number on one line, then the step text on the next line and it allows us to define prefix text used before each. private LazyLoad _IdentAltPrint; public string IdentAltPrint { @@ -6503,6 +5798,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _IdentAltPrint, "TabData/@IdentAltPrint"); } } + + // defines a step type's corresponding RNO tab seen in the PROMS Step Editor private LazyLoad _RNOIdentEdit; public string RNOIdentEdit { @@ -6511,6 +5808,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RNOIdentEdit, "TabData/@RNOIdentEdit"); } } + + // defines a step type's corresponding RNO tab for the printed output private LazyLoad _RNOIdent; public string RNOIdent { @@ -6519,6 +5818,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RNOIdent, "TabData/@RNOIdent"); } } + // this uses the same format item as RNOIdent private LazyLoad _RNOIdentPrint; public string RNOIdentPrint { @@ -6527,6 +5827,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RNOIdentPrint, "TabData/@RNOIdent"); } } + + // don't use the defined macro when creating a step tab for the step type's RNO private LazyLoad _RNOExcludeMacros; public bool RNOExcludeMacros { @@ -6535,6 +5837,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RNOExcludeMacros, "TabData/@RNOExcludeMacros"); } } + + // Don't Align Tabs for numeric tabs that can go to 2 digits - Default is False - we do align numeric tabs + // - used in the Indian Point Unit 2 Background format (IP2BCK) private LazyLoad _NoTabAlign; public bool NoTabAlign { @@ -6543,6 +5848,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoTabAlign, "TabData/@NoTabAlign"); } } + + // used for Caution and Note steps, include the step number along with the Caution or Note tab + // was put in for V.C. Summer Units 3 & 4 formats private LazyLoad _IncludeStepNum; public bool IncludeStepNum { @@ -6551,6 +5859,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _IncludeStepNum, "TabData/@IncludeStepNum"); } } + // used for Caution and Note steps, include the section number along with the Caution or Note tab + // - used with IncludeStepNum + // was put in for V.C. Summer Units 3 & 4 formats private LazyLoad _IncludeSectionNum; public bool IncludeSectionNum { @@ -6559,6 +5870,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _IncludeSectionNum, "TabData/@IncludeSectionNum"); } } + // used to center justify the resulting Caution or Note tab within the defined Caution or Note box private LazyLoad _Justify; public string Justify { @@ -6567,6 +5879,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Justify, "TabData/@Justify"); } } + + // put in for V.C. Summer's Transition Caution Transition Note types - The text of these types contain a transtion link and is used for the Caution or Note tab of the "normal" Caution or Note - used with IsTransition TabData flag private LazyLoad _UsePreviousStyle; public bool UsePreviousStyle { @@ -6575,6 +5889,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UsePreviousStyle, "TabData/@UsePreviousStyle"); } } + + // The text of these types contain a transtion link and is used for the Caution or Note tab of the "normal" Caution or Note private LazyLoad _IsTransition; public bool IsTransition { @@ -6583,6 +5899,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _IsTransition, "TabData/@IsTransition"); } } + + // set a hard-coded with of the step tab private LazyLoad _IdentWidth; public float? IdentWidth { @@ -6591,6 +5909,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _IdentWidth, "TabData/@IdentWidth"); } } + + // adjustment for step type's RNO tab width private LazyLoad _RNOAdjustTabSize; public float? RNOAdjustTabSize { @@ -6599,6 +5919,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RNOAdjustTabSize, "TabData/@RNOAdjustTabSize"); } } + + // adjustment to the horizontal position of the step tab's print macro private LazyLoad _MacroTabAdjust; public float? MacroTabAdjust { @@ -6607,6 +5929,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _MacroTabAdjust, "TabData/@MacroTabAdjust"); } } + // specified font to use for the step tab private VE_Font _Font; public VE_Font Font { @@ -6620,6 +5943,8 @@ namespace VEPROMS.CSLA.Library return _Font; } } + + // gets the step tab's bull information if so defined private Bullet _Bullet; public Bullet Bullet { @@ -6628,6 +5953,9 @@ namespace VEPROMS.CSLA.Library return (_Bullet == null) ? _Bullet = new Bullet(base.XmlNode) : _Bullet; } } + + // will prevent white space from being removed before and after the Tab text + // - only used when tab justification is Centered private LazyLoad _NoTrim; public bool NoTrim { @@ -6636,6 +5964,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoTrim, "TabData/@NoTrim"); } } + + // use the entire section number when building the step tab - existing logic looked for the text "Attachmen" then used the letter/number that followed it private LazyLoad _UseEntireSectionNum; public bool UseEntireSectionNum { @@ -6644,7 +5974,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseEntireSectionNum, "TabData/@UseEntireSectionNum"); } } - // this will remove white space before/after the tab value + + // this will remove white space before/after the sequential tab value // put in for Vogtal Units 3 & 4 formats for continuous action sub-steps // they have tab value within parenthesis and for a single digit/letter we don't want the white steps before or after it private LazyLoad _TrimSeqTabValue; @@ -6657,7 +5988,7 @@ namespace VEPROMS.CSLA.Library } } - #endregion + #endregion StepTab #region MacroList [TypeConverter(typeof(vlnListConverter))] public class MacroList : vlnNamedFormatList @@ -6672,13 +6003,15 @@ namespace VEPROMS.CSLA.Library } } } - #endregion + #endregion MacroList #region Macro [TypeConverter(typeof(ExpandableObjectConverter))] public class Macro : vlnFormatItem, IVlnNamedFormatItem { public Macro(XmlNode xmlNode) : base(xmlNode) { } public Macro() : base() { } + + // used to identify the tab's print macro private LazyLoad _Name; public string Name { @@ -6687,6 +6020,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Name, "@Name"); } } + + // the name of the print macro defined in the format's corresponding SVG (genmac) file private LazyLoad _MacroDef; public string MacroDef { @@ -6696,6 +6031,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _MacroDef, "@Macro"); } } + + // the name of the print macro defined in the format's corresponding SVG (genmac) file + // that is only used when the step type is used in a single column procedure private LazyLoad _SingleColMacroDef; public string SingleColMacroDef { @@ -6705,6 +6043,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SingleColMacroDef, "@SingleColMacro"); } } + + // hard coded horizontal addjustment used before printing the macro private LazyLoad _MacroXOffSet; public float? MacroXOffSet { @@ -6713,6 +6053,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _MacroXOffSet, "@MacroXOffSet"); } } + + // a width adjustment to the print macro (usually a negative value) private LazyLoad _SingleColWidthAdjust; public float? SingleColWidthAdjust { @@ -6721,6 +6063,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SingleColWidthAdjust, "@SingleColWidthAdjust"); } } + + // locate the macro along with the tab's offset. + // however, if the tab is more than 2 characters long, adjust so that it aligns with the + // last two characters, not the first 2. private LazyLoad _LocWithXOff; public bool? LocWithXOff { @@ -6729,7 +6075,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _LocWithXOff, "@LocWithXOff"); } } - + + // Groupings is used to only have the macro if there are N or more of the type in the grouping. private LazyLoad _Grouping; public int? Grouping { @@ -6739,6 +6086,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Grouping, "@Grouping"); } } + + // only add this macro to the result list if the item is not in the RNO column. private LazyLoad _NotInRNO; public bool NotInRNO { @@ -6748,14 +6097,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NotInRNO, "@NotInRNO"); } } - + private bool? _Inherited; public bool Inherited { get { - if (_Inherited == null) SetupStepInheritance(); - return (bool) _Inherited; + if (_Inherited == null) SetupStepInheritance(); + return (bool)_Inherited; } } private void SetupStepInheritance() @@ -6769,20 +6118,22 @@ namespace VEPROMS.CSLA.Library if (xn != null) { _MacroDef = new LazyLoad(RetrieveString(xn.SelectSingleNode("@Macro"))); - _Grouping = new LazyLoad(RetrieveInt("@Grouping" ,xn.SelectSingleNode("@Grouping"))); - _NotInRNO = new LazyLoad(RetrieveBool( xn.SelectSingleNode("@NotInRNO"))); + _Grouping = new LazyLoad(RetrieveInt("@Grouping", xn.SelectSingleNode("@Grouping"))); + _NotInRNO = new LazyLoad(RetrieveBool(xn.SelectSingleNode("@NotInRNO"))); } } } -#endregion + #endregion Macro #endregion #region BoxDataAll #region Box [TypeConverter(typeof(ExpandableObjectConverter))] - public class Box : vlnFormatItem,IVlnIndexedFormatItem + public class Box : vlnFormatItem, IVlnIndexedFormatItem { public Box(XmlNode xmlNode) : base(xmlNode) { } public Box() : base() { } + + // used by the step type to reference which box to use (Cautions, Notes) private LazyLoad _Index; public int? Index { @@ -6791,22 +6142,27 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Index, "@Index"); } } + // This was added to support 3 line box for VC Summer Units 3 & 4 Alarms. It is only checked in the 'double line' vlnbox.cs code! private LazyLoad _NumLines; - public int? NumLines // This was added to support 3 line box for VC Summer Alarms. It is only checked in 'double line' vlnbox.cs code! + public int? NumLines { get { return LazyLoad(ref _NumLines, "@NumLines"); } } + + // the column where the box starts printing private LazyLoad _Start; public float? Start - { - get + { + get { return LazyLoad(ref _Start, "@Start"); - } + } } + + // the column where to stop printing the box private LazyLoad _End; public float? End { @@ -6815,6 +6171,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _End, "@End"); } } + + // column position to start printing the text that is inside the box private LazyLoad _TxtStart; public float? TxtStart { @@ -6823,6 +6181,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TxtStart, "@TxtStart"); } } + + // the length of the text before it wraps to the next line private LazyLoad _TxtWidth; public float? TxtWidth { @@ -6831,14 +6191,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TxtWidth, "@TxtWidth"); } } - private LazyLoad _Height; - public float? Height - { - get - { - return LazyLoad(ref _Height, "@Height"); - } - } + + // an absolute position from the left margin where the Caution or Note tab text (box header) is placed within the drawn box - used for boxed Cautions and/or Notes - Caution or Note tab justification needs to be "Centered" private LazyLoad _TabPos; public float? TabPos { @@ -6847,15 +6201,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TabPos, "@TabPos"); } } - private LazyLoad _TxtRowAdj; - public int? TxtRowAdj - { - get - { - return LazyLoad(ref _TxtRowAdj, "@TxtRowAdj"); - } - } - private LazyLoad _ThickDouble; // F2021-026: Barakah single column 2 thick double lines around Warnings + + // this will adjust the line spacing when an extra thick line is used for a box, so that the text below the box doesn't hit up against the bottom of the box + private LazyLoad _ThickDouble; // F2021-026: Barakah single column 2 thick double lines around Warnings public bool ThickDouble { get @@ -6863,14 +6211,18 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ThickDouble, "@ThickDouble"); } } + + // the character used for the Upper Right Corner of the box private LazyLoad _BXURC; public string BXURC - { - get + { + get { return LazyLoad(ref _BXURC, "@BXURC"); - } + } } + + // the character used to drawn the Horizontal line of the box private LazyLoad _BXHorz; public string BXHorz { @@ -6879,6 +6231,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BXHorz, "@BXHorz"); } } + + // the character used for the Upper Left Corner of the box private LazyLoad _BXULC; public string BXULC { @@ -6887,6 +6241,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BXULC, "@BXULC"); } } + // the character used for the vertcal lines of the left and right sides of the box private LazyLoad _BXVert; public string BXVert { @@ -6895,6 +6250,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BXVert, "@BXVert"); } } + + // the character used for the left side that connect to a horizontal line + // (usually the char looks like a T that is rotated to the left 90 degrees) private LazyLoad _BXMLS; public string BXMLS { @@ -6903,6 +6261,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BXMLS, "@BXMLS"); } } + + // the character used for the right side that connect to a horizontal line + // (usually the char looks like a T that is rotated to the right 90 degrees) private LazyLoad _BXMRS; public string BXMRS { @@ -6911,6 +6272,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BXMRS, "@BXMRS"); } } + + // the character used for the Lower (bottom) Right Corner of the box private LazyLoad _BXLRC; public string BXLRC { @@ -6919,6 +6282,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BXLRC, "@BXLRC"); } } + + // the character used for the Lower (bottom) Left Corner of the box private LazyLoad _BXLLC; public string BXLLC { @@ -6927,6 +6292,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BXLLC, "@BXLLC"); } } + + // character used in the middle of the box an intersection of four cells + // - looks like a big plus sign private LazyLoad _BXMID; public string BXMID { @@ -6935,6 +6303,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BXMID, "@BXMID"); } } + + // character used for the Lower Horizontal line (bottom of the box) private LazyLoad _BXLHorz; public string BXLHorz { @@ -6943,6 +6313,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BXLHorz, "@BXLHorz"); } } + // character use on the top line of the box that will connect to a horizontal line in the next row of the box + // - looks like a "T" character private LazyLoad _BXUMID; public string BXUMID { @@ -6951,6 +6323,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BXUMID, "@BXUMID"); } } + + // character use on the bottom line of the box that will connect to a horizontal line in the row above- looks like an upside down "T" character private LazyLoad _BXLMID; public string BXLMID { @@ -6959,12 +6333,13 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BXLMID, "@BXLMID"); } } + // a specific font to use for the box drawing characters private VE_Font _Font; public VE_Font Font { get { - return (_Font == null) ?_Font = new VE_Font(base.XmlNode):_Font; + return (_Font == null) ? _Font = new VE_Font(base.XmlNode) : _Font; } } public override string GetPDDisplayName() @@ -6976,6 +6351,7 @@ namespace VEPROMS.CSLA.Library return String.Format("{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {10}, {11}", BXURC, BXHorz, BXULC, BXVert, BXMLS, BXMRS, BXLRC, BXLLC, BXMID, BXLHorz, BXUMID, BXLMID); } + // this return string is used in a Switch/Case statement to determin the visual style of the box when printing public string BoxStyle { get @@ -6985,7 +6361,7 @@ namespace VEPROMS.CSLA.Library } } } - #endregion + #endregion Box #region BoxList [TypeConverter(typeof(vlnIndexedListConverter))] public class BoxList : vlnIndexedFormatList @@ -7003,8 +6379,8 @@ namespace VEPROMS.CSLA.Library } } - #endregion - #endregion + #endregion Boxlist + #endregion BoxDataAll #region TransDataAll #region TransData [TypeConverter(typeof(ExpandableObjectConverter))] @@ -7015,18 +6391,22 @@ namespace VEPROMS.CSLA.Library { get { - return(_TransTypeList == null || _TransTypeList.MaxIndex==0)? _TransTypeList = new TransTypeList(SelectNodes("TransTypeData/TransTypes"),MyFormat): _TransTypeList; + return (_TransTypeList == null || _TransTypeList.MaxIndex == 0) ? _TransTypeList = new TransTypeList(SelectNodes("TransTypeData/TransTypes"), MyFormat) : _TransTypeList; } } public TransData(XmlNode xmlNode) : base(xmlNode) { } + + // a character that is placed before and after the title that's in the transition text private LazyLoad _DelimiterForTransitionTitle; public string DelimiterForTransitionTitle - { - get + { + get { return LazyLoad(ref _DelimiterForTransitionTitle, "@DelimiterForTransitionTitle"); - } + } } + + // used to clean up step/sub-step delimeters so they are all just periods in transitions and are removed when getting step/sub-step tab for some reports private LazyLoad _StepSubstepDelimeter; public string StepSubstepDelimeter { @@ -7035,6 +6415,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _StepSubstepDelimeter, "@StepSubstepDelimeter"); } } + + // string to use between the first step and last step of the transition ("Through" vs "Thur" etc.) private LazyLoad _ThroughString; public string ThroughString { @@ -7043,14 +6425,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ThroughString, "@ThroughString"); } } - private LazyLoad _SpecifiedSubstepsOnly; - public bool SpecifiedSubstepsOnly - { - get - { - return LazyLoad(ref _SpecifiedSubstepsOnly, "@SpecifiedSubstepsOnly"); - } - } + + // this will uppercase the transition text private LazyLoad _CapsTransitions; public bool CapsTransitions { @@ -7059,6 +6435,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CapsTransitions, "@CapsTransitions"); } } + + // this will uppercase the section title inside the transition private LazyLoad _CapsTransitionsSection; public bool CapsTransitionsSection { @@ -7067,22 +6445,18 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CapsTransitionsSection, "@CapsTransitionsSection"); } } - private LazyLoad _CapTranStep; - public bool CapTranStep - { - get - { - return LazyLoad(ref _CapTranStep, "@CapTranStep"); - } - } + + // this will underline the transsition text private LazyLoad _Underline; public bool Underline { - get + get { return LazyLoad(ref _Underline, "@Underline"); } } + + // add the high level step number to the sub-step tab in the transition private LazyLoad _TStepNoFlag; public bool TStepNoFlag { @@ -7091,14 +6465,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TStepNoFlag, "@TStepNoFlag"); } } - private LazyLoad _LowerCaseTranNumber; - public bool LowerCaseTranNumber - { - get - { - return LazyLoad(ref _LowerCaseTranNumber, "@LowerCaseTranNumber"); - } - } + + // will uppercase AND in And transition type private LazyLoad _UpcaseTranAnd; public bool UpcaseTranAnd { @@ -7107,14 +6475,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UpcaseTranAnd, "@UpcaseTranAnd"); } } - private LazyLoad _SuppressAndInTran; - public bool SuppressAndInTran - { - get - { - return LazyLoad(ref _SuppressAndInTran, "@SuppressAndInTran"); - } - } + + // will uppercase the first letter of each word in the transition private LazyLoad _Cap1stCharTrans; public bool Cap1stCharTrans { @@ -7123,7 +6485,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Cap1stCharTrans, "@Cap1stCharTrans"); } } - // Title Case section title + + // Title Case section title in the transition private LazyLoad _Cap1stCharTransSection; public bool Cap1stCharTransSection { @@ -7132,7 +6495,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Cap1stCharTransSection, "@Cap1stCharTransSection"); } } - // Title Case section number + // Title Case Section Number in the transition private LazyLoad _Cap1stCharTransSectionNumber; public bool Cap1stCharTransSectionNumber { @@ -7141,7 +6504,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Cap1stCharTransSectionNumber, "@Cap1stCharTransSectionNumber"); } } - // Parens around section title + + // put parenthesis around section title private LazyLoad _ParensAroundSectionTitle; public bool ParensAroundSectionTitle { @@ -7150,6 +6514,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ParensAroundSectionTitle, "@ParensAroundSectionTitle"); } } + + // turns on the option to add a page number to the transition BUT only for transition types 1, 2, and 4 private LazyLoad _UseTransitionModifier; public bool UseTransitionModifier { @@ -7158,6 +6524,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseTransitionModifier, "@UseTransitionModifier"); } } + + // will include a page number with the transitions - will not turn on option box to add a the page number private LazyLoad _UseSpecificTransitionModifier; public bool UseSpecificTransitionModifier { @@ -7166,6 +6534,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseSpecificTransitionModifier, "@UseSpecificTransitionModifier"); } } + + // the specific page number is always printed even if it is next or previous page, instead of using the 'Next Page' or 'Previous Page' text private LazyLoad _UseSpecificPageNo; public bool UseSpecificPageNo { @@ -7174,6 +6544,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseSpecificPageNo, "@UseSpecificPageNo"); } } + + // indclude the section number and section title when the {Sect Hdr} transition format token is used - set to False if we only want the section number private LazyLoad _UseSecTitles; public bool UseSecTitles { @@ -7182,6 +6554,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseSecTitles, "@UseSecTitles"); } } + + // turn on the section selection list for transitions that use the default steps section private LazyLoad _DoSectionTransitions; public bool DoSectionTransitions { @@ -7190,6 +6564,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _DoSectionTransitions, "@DoSectionTransitions"); } } + // having a default step section specified is not required for transitions with section information private LazyLoad _NoDefaultSectReq; public bool NoDefaultSectReq { @@ -7198,14 +6573,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoDefaultSectReq, "@NoDefaultSectReq"); } } - private LazyLoad _AllowTransitionFromSection; - public bool AllowTransitionFromSection - { - get - { - return LazyLoad(ref _AllowTransitionFromSection, "@AllowTransitionFromSection"); - } - } + + // replace spaces with hard spaces in procedure number private LazyLoad _HardSpTranProcNumb; public bool HardSpTranProcNumb { @@ -7214,6 +6583,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _HardSpTranProcNumb, "@HardSpTranProcNumb"); } } + + // replaces the frist occurence of a space to a hard space private LazyLoad _XchngTranSpForHard; public bool XchngTranSpForHard { @@ -7222,22 +6593,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _XchngTranSpForHard, "@XchngTranSpForHard"); } } - private LazyLoad _AbsoluteTransitionUpdate; - public bool AbsoluteTransitionUpdate - { - get - { - return LazyLoad(ref _AbsoluteTransitionUpdate, "@AbsoluteTransitionUpdate"); - } - } - private LazyLoad _LowerCaseStepInTran; - public bool LowerCaseStepInTran - { - get - { - return LazyLoad(ref _LowerCaseStepInTran, "@LowerCaseStepInTran"); - } - } + + // Bold all of the transition text private LazyLoad _BoldTransition; public bool BoldTransition { @@ -7246,6 +6603,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BoldTransition, "@BoldTransition"); } } + + // Bold the transition if it's not in a high level step private LazyLoad _BoldTransitionExceptHLS; public bool BoldTransitionExceptHLS { @@ -7254,7 +6613,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BoldTransitionExceptHLS, "@BoldTransitionExceptHLS"); } } - // B2017-269 Don't bold transition if font for step is bold + + // B2017-269 Don't bold transition if a high level step or font for step is bold private LazyLoad _BoldTransitionExceptBoldHLS; public bool BoldTransitionExceptBoldHLS { @@ -7263,6 +6623,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BoldTransitionExceptBoldHLS, "@BoldTransitionExceptBoldHLS"); } } + + // remove the "s" in "Procedure Steps" (section title) when transition references only one step private LazyLoad _AdjustStepTransitionText; public bool AdjustStepTransitionText { @@ -7271,16 +6633,19 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AdjustStepTransitionText, "@AdjustStepTransitionText"); } } - //ProcLevelPCPC + + // remove the parent/child unit designators from the procedure number in the transition references private LazyLoad _ProcLevelPCPC; - public bool ProcLevelPCPC // B2022-004: Remove Proc PC/PC token from transition text + public bool ProcLevelPCPC // B2022-004: Remove Proc PC/PC token from transition text { get { return LazyLoad(ref _ProcLevelPCPC, "@ProcLevelPCPC"); } } + // F2024-030 for Vogtle Units 3 & 4, added KeepOnePCPCTag flag to keep one of the PC/PC tokens when editing + // keep one of the parent/child unit designators in the transition reference private LazyLoad _KeepOnePCPCTag; public bool KeepOnePCPCTag { @@ -7290,13 +6655,15 @@ namespace VEPROMS.CSLA.Library } } } - #endregion + #endregion TransData #region TransType [TypeConverter(typeof(ExpandableObjectConverter))] - public class TransType : vlnFormatItem,IVlnIndexedFormatItem + public class TransType : vlnFormatItem, IVlnIndexedFormatItem { public TransType(XmlNode xmlNode) : base(xmlNode) { } public TransType() : base() { } + + // allows us to re-define a default transition (from BASE format) and create new transition types private LazyLoad _Index; public int? Index { @@ -7305,6 +6672,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Index, "@Index"); } } + + // holdover from 16bit, used to define whether transitions are range (types 2 & 3). this is used in the logic for transitions with page numbers private LazyLoad _Type; public int? Type { @@ -7313,6 +6682,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Type, "@TransType"); } } + + // defines the contents that including in a Transition type. private LazyLoad _TransFormat; public string TransFormat { @@ -7321,6 +6692,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TransFormat, "@TransFormat"); } } + + // defines what procedure information is selectable in the User Interface used to select a transition type to insert in the procedure text private LazyLoad _TransUI; public E_TransUI? TransUI { @@ -7329,6 +6702,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TransUI, "@TransUI"); } } + + // defines what is shown in list of transition types, on the User Interface used to select a transition type to insert in the procedure text private LazyLoad _TransMenu; public string TransMenu { @@ -7337,8 +6712,13 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TransMenu, "@TransMenu"); } } - private LazyLoad _UnitProcSetString; //B2019-072: For AEP, use PSI & SI for outside transition text - public string UnitProcSetString // this is format of string to preface transition with + + //B2019-072: For AEP, use PSI & SI for outside transition text. + // ex: UnitProcSetString ="{PSI:UNITCOM}-{SI:SETNAME}-{PSI:SETID|4023}-" will look for UNITCOM in + // the Procedure Specific Information, then SETNAME in the Set Specific Information (working draft), + // then the SETID in the Procedure Specific Information (or use 4023) if nothing is entered + private LazyLoad _UnitProcSetString; + public string UnitProcSetString { get { @@ -7351,15 +6731,15 @@ namespace VEPROMS.CSLA.Library { return "Transition Type Data"; } public override string ToString() { - return string.Format("{0} - {1}",TransFormat, TransMenu); + return string.Format("{0} - {1}", TransFormat, TransMenu); } } - #endregion + #endregion TransType #region TransTypeList [TypeConverter(typeof(vlnIndexedListConverter))] public class TransTypeList : vlnIndexedFormatList { - public TransTypeList(XmlNodeList xmlNodeList, IFormatOrFormatInfo myFormat) : base(xmlNodeList,myFormat) { } + public TransTypeList(XmlNodeList xmlNodeList, IFormatOrFormatInfo myFormat) : base(xmlNodeList, myFormat) { } public override vlnIndexedFormatList InheritedList { get @@ -7371,12 +6751,16 @@ namespace VEPROMS.CSLA.Library } } } - #endregion + #endregion TransTypeList + #region RoData [TypeConverter(typeof(ExpandableObjectConverter))] public class ROData : vlnFormatItem { public ROData(XmlNode xmlNode) : base(xmlNode) { } + + //In a sequence of RO values, the unit appears with every value + //(e.g., "25 gpm and 30 gpm" vs. "25 and 30 gpm") private LazyLoad _AllUnits; public bool AllUnits { @@ -7385,6 +6769,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AllUnits, "@AllUnits"); } } + + // If a R0 follows a "- " then it will be uppercased, THE "- " can be anywere in the text before the RO value private LazyLoad _UpRoAftrDash; public bool UpRoAftrDash { @@ -7393,6 +6779,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UpRoAftrDash, "@UpRoAftrDash"); } } + + // Put in for Wolf Creek, where the "- " should be right before the link for the RO to be uppercased. private LazyLoad _UpRoImmAftrDashSpace; public bool UpRoImmAftrDashSpace { @@ -7401,6 +6789,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UpRoImmAftrDashSpace, "@UpRoImmAftrDashSpace"); } } + + // Always uppercase the RO value units (PSI, GPM, etc.) private LazyLoad _UpcaseAllRoUnits; public bool UpcaseAllRoUnits { @@ -7409,6 +6799,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UpcaseAllRoUnits, "@UpcaseAllRoUnits"); } } + + // Forces the units for a RO to be uppercased for high level steps private LazyLoad _CapHighRo; public bool CapHighRo { @@ -7417,6 +6809,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CapHighRo, "@CapHighRo"); } } + + // uppercase ROs anywhere if no lower case text follows and an upper case letter immediately precedes the RO. private LazyLoad _CapRoIfLastLower; public bool CapRoIfLastLower { @@ -7425,6 +6819,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CapRoIfLastLower, "@CapRoIfLastLower"); } } + + // uppercase the RO, if it is a Setpoint type of RO, anywhere if no lower case text follows and an upper case letter immediately precedes the RO. private LazyLoad _CapSPIfLastLower; public bool CapSPIfLastLower { @@ -7433,6 +6829,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CapSPIfLastLower, "@CapSPIfLastLower"); } } + + // Uppercase the RO Unit if the previous letter is uppercase private LazyLoad _UpRoIfPrevUpper; public bool UpRoIfPrevUpper { @@ -7441,6 +6839,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UpRoIfPrevUpper, "@UpRoIfPrevUpper"); } } + + // Underline all ROs, values and Units private LazyLoad _UnderlineRo; public bool UnderlineRo { @@ -7449,6 +6849,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UnderlineRo, "@UnderlineRo"); } } + + // Cap only the first letters of the units in a high level RO + // used in FLP (Turkey Point) format private LazyLoad _CapFirstLetterInHighRO; public bool CapFirstLetterInHighRO { @@ -7457,6 +6860,10 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CapFirstLetterInHighRO, "@CapFirstLetterInHighRO"); } } + + // put in for Byron and Braidwood which has RO values containing non-PROMS procedure references as ROs. + // need to replace the unicode dash (\u8209?) with the dash character before the RO is resolved in order + // to retain the the upper and lower case lettering of the procedure number in the RO value (B2019-171) private LazyLoad _DoSpaceDashBeforeROResolve; public bool DoSpaceDashBeforeROResolve { @@ -7466,8 +6873,8 @@ namespace VEPROMS.CSLA.Library } } } - #endregion - #endregion + #endregion RoData + #endregion TransDataAll #region SupportClasses public class StepDataRetval { @@ -7489,6 +6896,6 @@ namespace VEPROMS.CSLA.Library Index = index; } } - #endregion + #endregion SupportClasses } diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index eb7437be..e8d9aeb4 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -2973,11 +2973,6 @@ namespace Volian.Controls.Library TopMostEditItem.ItemLocation = new Point(TopMostEditItem.ItemLocation.X, _MyParentEditItem.Bottom); //TextWidth = _WidthAdjust + borderWidth + MyStepPanel.ToDisplay(_MyStepSectionLayoutData.WidSTableEdit, Convert.ToInt32(_MyStepSectionLayoutData.PMode) - 1); ContentWidth = _WidthAdjust + BorderWidth + MyStepPanel.ToDisplay(MyStepSectionLayoutData.WidSTableEdit, MyItemInfo.ColumnMode); - //ContentWidth = _WidthAdjust + BorderWidth; - //if (MyItemInfo.FormatStepData.WidthOverrideEdit != null && MyItemInfo.FormatStepData.WidthOverrideEdit > 0) - // ContentWidth += MyStepPanel.ToDisplay(MyItemInfo.FormatStepData.WidthOverrideEdit); - //else - // ContentWidth += MyStepPanel.ToDisplay(MyStepSectionLayoutData.WidSTableEdit, MyItemInfo.ColumnMode); break; case 2: // Step // if Table then determine width and location based upon it's parent's location diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index ca343df9..a8f052cd 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -611,7 +611,7 @@ namespace Volian.Controls.Library // RichTextBox will not allow the character to be removed this way and the RichTextBox // will beep. So, to keep from going in an infintie loop, the value of indchar is incremented. SelectedRtf = SelectedRtf.Replace(@"\'05", ""); - indchar++;// Don't so the same one twice. + indchar++;// Don't do the same one twice. } if (MyItemInfo != null && MyItemInfo.ActiveFormat != null && MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.DontResetIndentOnNewline) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index d056d8e7..5148bd3e 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -3179,7 +3179,7 @@ namespace Volian.Print.Library // C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet. // B2021-085 & 087: crash if noBullet was null. Also, if null, see if text in parent. if no text, replace the // "%s." with noBullet (null) which won't put out just a '.' as step number. - if (MyItemInfo.MyDocStyle.Continue.Top.RemoveBullet) + if (MyItemInfo.MyDocStyle.Continue.Bottom.RemoveBullet) { if (tmp == null && MyItemInfo.IsCautionOrNotePart) tmp = MyItemInfo.MyParent.CombinedTab; if (tmp != null) @@ -7047,19 +7047,6 @@ namespace Volian.Print.Library if (formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffHeaderInPagelist) return true; return false; } - // Currently not used. - // - //private bool UseCheckOffsDocStyle(int oldToNew, FormatInfo formatInfo) - //{ - // int bit, retval=0; - // int mask=1; - - // for(bit=0; bit < 32; bit++){ - // if ((oldToNew & mask) != 0 && ((int)formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.UseCheckOffsIn & mask) !=0) retval = 1; - // mask <<= 1; - // } - // return retval > 0; - //} } /// diff --git a/PROMS/Volian.Print.Library/vlnPrintObject.cs b/PROMS/Volian.Print.Library/vlnPrintObject.cs index 392f8a19..b09edea2 100644 --- a/PROMS/Volian.Print.Library/vlnPrintObject.cs +++ b/PROMS/Volian.Print.Library/vlnPrintObject.cs @@ -192,26 +192,7 @@ namespace Volian.Print.Library } public float GetParagraphHeight(PdfContentByte cb, Paragraph iParagraph, string suffix, float width, bool throwException) { - VlnSvgPageHelper ph = null; - if(cb != null) ph = cb.PdfWriter.PageEvent as VlnSvgPageHelper; float heightAll = GetHeight(cb, iParagraph, suffix, width, throwException); - if (ph != null && ph.MyPromsPrinter.DebugOutput && !MyPageHelper.Back32BitPROMS) - { - vlnParagraph myParagraph = this as vlnParagraph; - if (myParagraph != null) - { - //if (myParagraph.MyItemInfo.FormatStepData != null && myParagraph.MyItemInfo.FormatStepData.Font.Family == "Prestige Elite Tall") - //if (!myParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.WrapSameAsEdit) - //{ - // Chunk chk = RemoveLastCharacter(iParagraph); - // float heightAllButOne = GetHeight(cb, iParagraph, width, throwException); - // if (heightAll != heightAllButOne) - // return heightAllButOne; - // if (chk != null) - // RestoreLastCharacter(iParagraph, chk); - //} - } - } return heightAll; } private static void RestoreLastCharacter(Paragraph iParagraph, Chunk chk)