diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index e8035ce8..c9080cda 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -92,7 +92,11 @@ namespace Volian.Print.Library } else // Change Box Style { - if (bxIndx != null) + bool handleSeparateBox = true; + if (childItemInfo.IsCaution && !childItemInfo.FormatStepData.SeparateBoxCautions) handleSeparateBox = false; + if (childItemInfo.IsNote && !childItemInfo.FormatStepData.SeparateBox) handleSeparateBox = false; + + if (bxIndx != null && (handleSeparateBox || bxIndex != bxIndx)) { if (box != null) { @@ -1209,8 +1213,10 @@ namespace Volian.Print.Library } else if (mytab != null) { - mytab.XOffset += mytab.Width; + float adjusttab = (itemInfo.MyParent.IsHigh) ? itemInfo.FormatStepData.AdjHighLevelTab??0 : 0; + mytab.XOffset += (mytab.Width + adjusttab); XOffset = mytab.XOffset + mytab.Width; + if (adjusttab != 0) Width += (mytab.Width); } } if(adjustAgain)