diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 67102779..a87b2de3 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1375,7 +1375,14 @@ namespace Volian.Print.Library // substep... check the CautionOrNoteSubstepIndent value, this is the additional indent amount in number // of characters. if (itemInfo.MyParent.IsCaution || itemInfo.MyParent.IsNote) - XOffset += 72 * (itemInfo.FormatStepData.CautionOrNoteSubstepIndent == null ? 0 : (float)itemInfo.FormatStepData.CautionOrNoteSubstepIndent / (float)itemInfo.FormatStepData.Font.CPI); + { + // if this is a Note or Caution off of a Note or Caution (Catawba EG/1A/CSAM/SACGR1 step 1) + // then indent it the length of its tab + if (itemInfo.IsCaution || itemInfo.IsNote) + XOffset += (itemInfo.FormatStepData.TabData.IdentPrint.Length -1) * 6; + else + XOffset += 72 * (itemInfo.FormatStepData.CautionOrNoteSubstepIndent == null ? 0 : (float)itemInfo.FormatStepData.CautionOrNoteSubstepIndent / (float)itemInfo.FormatStepData.Font.CPI); + } if (itemInfo.IsStep && itemInfo.MyHLS != null && itemInfo.MyHLS.FormatStepData.UseSmartTemplate && itemInfo.FormatStepData.StepLayoutData.AlignWithParentTab @@ -2925,6 +2932,8 @@ namespace Volian.Print.Library float mycolT = (float)formatInfo.MyStepSectionLayoutData.ColT; if (formatInfo.MyStepSectionLayoutData.Dev_Format) Width = (float)formatInfo.MyStepSectionLayoutData.WidT + 1; + else if (itemInfo.IsInRNO) + Width = (float)vlnPrintObject.ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, maxRNO)- tabWidth; else Width = (float)formatInfo.MyStepSectionLayoutData.WidT - 6 - mycolT; XOffset += mycolT; // adjust caution/note text position