diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index acf7b62d..0dbdf3b2 100644 Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ diff --git a/PROMS/Formats/fmtall/CATDEVall.xml b/PROMS/Formats/fmtall/CATDEVall.xml index 891b720e..4dae90af 100644 Binary files a/PROMS/Formats/fmtall/CATDEVall.xml and b/PROMS/Formats/fmtall/CATDEVall.xml differ diff --git a/PROMS/Formats/fmtall/TUECall.xml b/PROMS/Formats/fmtall/TUECall.xml index c8bce8ef..70aa6d12 100644 Binary files a/PROMS/Formats/fmtall/TUECall.xml and b/PROMS/Formats/fmtall/TUECall.xml differ diff --git a/PROMS/Formats/genmacall/tuec.svg b/PROMS/Formats/genmacall/tuec.svg index 2d212c48..2ea957eb 100644 Binary files a/PROMS/Formats/genmacall/tuec.svg and b/PROMS/Formats/genmacall/tuec.svg differ diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index 52947440..cfc23380 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -547,6 +547,17 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AdjSectTitleLoc, "@AdjSectTitleLoc"); } } + + // this will add additional spacing between the Section Numbers and Titles + private LazyLoad _SectTitleOffsetOverride; + public float? SectTitleOffsetOverride + { + get + { + return LazyLoad(ref _SectTitleOffsetOverride, "@SectTitleOffsetOverride"); + } + } + #endregion AdjSectTitleLoc #region ShowAlarmPointWindowInfo @@ -653,6 +664,21 @@ namespace VEPROMS.CSLA.Library } } #endregion + + #region AltMultiUnitWording + [Category("Miscellaneous")] + [Description("Alternate Wording for Printing when MultiUnit")] + + // this will utilize Alternate Wording for Printing when MultiUnit and PrintCommonForZeroUnit is set + private LazyLoad _AltMultiUnitWording; + public string AltMultiUnitWording + { + get + { + return LazyLoad(ref _AltMultiUnitWording, "@AltMultiUnitWording"); + } + } + #endregion IncludeInTOC public override string ToString() { return String.Format("{0:D2} - {1}", Index, Name); diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index f15899c6..0ec682e3 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1761,6 +1761,16 @@ i = 0; case "[HEADER4]": case "{HEADER5}": case "[HEADER5]": + case "{HEADER6}": + case "[HEADER6]": + case "{HEADER7}": + case "[HEADER7]": + case "{HEADER8}": + case "[HEADER8]": + case "{HEADER9}": + case "[HEADER9]": + case "{HEADER10}": + case "[HEADER10]": case "{BOX1}": case "[BOX1]": case "{BOX2}": @@ -2099,7 +2109,12 @@ i = 0; case "[UNITNUMBER]": string unbr = MySection.MyDocVersion.DocVersionConfig.Unit_Number; if (MySection.ActiveFormat.PlantFormat.FormatData.PrintData.PrintCommonForZeroUnit && unbr == "0") - plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON" + { + if (String.IsNullOrEmpty(MySection.MyDocStyle.AltMultiUnitWording)) + plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON" + else + plstr = MySection.MyDocStyle.AltMultiUnitWording; // for Comanche Peak Abnormal, replace "Unit 0" with "UNIT 1 AND 2" + } else plstr = plstr.Replace(token, unbr); break; diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 73b089b4..c9c5de92 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -6199,6 +6199,12 @@ namespace Volian.Print.Library XOffset += (float)formatInfo.PlantFormat.FormatData.SectData.MetaSectionList[level].SecTitlePositionAdj; XOffset -= xMetaAdj; } + + if (itemInfo.MyDocStyle.SectTitleOffsetOverride != null) + { + XOffset += (float)itemInfo.MyDocStyle.SectTitleOffsetOverride; + } + } } else if (formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Just == "PSCenter")