diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs index 71676dbc..c7bb9450 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs @@ -843,10 +843,11 @@ namespace VEPROMS.CSLA.Library float height = 72 * lines / 6.0F; float x = (float)sel.get_Information(LBWdInformation.wdHorizontalPositionRelativeToTextBoundary); // 9.25 is the approximate offset of the base line of the font, i.e. doesn't include descender. - float y = (float)sel.get_Information(LBWdInformation.wdVerticalPositionRelativeToTextBoundary) + ((sel.Font.Size * 9.25F) / 12); + float locvertpage = (float)sel.get_Information(LBWdInformation.wdVerticalPositionRelativeToPage); + float y = locvertpage + ((sel.Font.Size * 9.25F) / 12); sel.Text = ""; LBShape shape = myDoc.Shapes.AddPicture(roImageFile.MyFile.FullName, x, y, sel.Range); - shape.RelativeVerticalPosition = LBWdRelativeVerticalPosition.wdRelativeVerticalPositionMargin; + shape.RelativeVerticalPosition = LBWdRelativeVerticalPosition.wdRelativeVerticalPositionPage; shape.Top = y; // Reset value after setting flag RelativeVerticalPosition shape.RelativeHorizontalPosition = LBWdRelativeHorizontalPosition.wdRelativeHorizontalPositionMargin; shape.Left = x; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index b268462a..bf33b63c 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1060,6 +1060,13 @@ namespace VEPROMS.CSLA.Library return IsType("Caution2"); } } + public bool IsCaution1 + { + get + { + return IsType("Caution1"); + } + } public bool IsNote { get @@ -2831,7 +2838,12 @@ namespace VEPROMS.CSLA.Library _MyTab.BasicTab = isAlpha ? alpha : ordinal.ToString(); newtab = FormatStepData.TabData.IdentAltPrint.Substring(indxnewtab + 1); // also see if there is the 'pagelist' string in this tab: - HighLevelStepTabPageList = FormatStepData.TabData.IdentAltPrint.Substring(0, indxnewtab) + tbformat; + if ((FormatStepData.TabData.Font.Style & E_Style.Underline) == E_Style.Underline) + // the reason that the underline commands were not included in format file is that the '\' character + // is used as a separator and the following code will not impact other formats + HighLevelStepTabPageList = @"\ul " + FormatStepData.TabData.IdentAltPrint.Substring(0, indxnewtab).Trim() + @"\ulnone " + tbformat; + else + HighLevelStepTabPageList = FormatStepData.TabData.IdentAltPrint.Substring(0, indxnewtab) + tbformat; _MyTab.AltPrintTab = newtab; if (tbformate != null && tbformate != "") tbformat = tbformate; } diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 66138786..79f41e4a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -5419,6 +5419,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UpRoAftrDash, "@UpRoAftrDash"); } } + private LazyLoad _UpRoImmAftrDashSpace; + public bool UpRoImmAftrDashSpace + { + get + { + return LazyLoad(ref _UpRoImmAftrDashSpace, "@UpRoImmAftrDashSpace"); + } + } private LazyLoad _UpcaseAllRoUnits; public bool UpcaseAllRoUnits {