diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 2582d4a1..fe25a7da 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -439,7 +439,7 @@ namespace Volian.Print.Library // pagelist items in case there are some section items, for example the checkoff header needs // to be processed for each section whether or not it is continuous. SectionConfig.SectionPagination sPag = SectionConfig.SectionPagination.Separate; - if (mySection.IsStepSection && mySection.MyPrevious != null && mySection.MyPrevious.IsStepSection) + if (mySection.MyContent.Number.ToUpper() != "FOLDOUT" && mySection.IsStepSection && mySection.MyPrevious != null && mySection.MyPrevious.IsStepSection) { SectionConfig sc = mySection.MyConfig as SectionConfig; sPag = sc.Section_Pagination; @@ -586,7 +586,7 @@ namespace Volian.Print.Library // If this is a continuous section, then the only pagelist items we want are section type since // we are still on the same page. - CHECK IF ON SAME PAGE!!!! SectionConfig.SectionPagination sPag = SectionConfig.SectionPagination.Separate; - if (section.IsStepSection && section.MyPrevious != null && section.MyPrevious.IsStepSection) + if (section.IsStepSection && section.MyPrevious != null && section.MyPrevious.IsStepSection && section.MyContent.Number.ToUpper() != "FOLDOUT") { SectionConfig sc = section.MyConfig as SectionConfig; sPag = sc.Section_Pagination; @@ -830,15 +830,14 @@ namespace Volian.Print.Library // Otherwise determine how many line to split the text into List titleLines = SplitText(title, (int)len); - // if the token was proctitle, dont' adjust. If the token was PROCTITLE1/2 then - // move down 6. - int adj = pageItem.Token.Contains("1") || pageItem.Token.Contains("2") ? 0 : -6; - float yOffset = adj * (titleLines.Count - 1); + // Adjust y location based on which pagelist token & how many lines. Proctitle1 is adjusted if + // there are more than 2 lines (proctitle1 should have it's own y location that is used if there are 1 or 2 lines.) + float yOffset = (pageItem.Token.Contains("1") && titleLines.Count <= 2) ? 0 : (-6 * (titleLines.Count - 1)); int cnt = 0; foreach (string line in titleLines) { cnt++; - if (cnt == 1 && adj == 0) // adj == 0 means we use PROCTITLE1/PROCTITLE2 pagelist tokens + if (cnt == 1 && yOffset == 0) // adj == 0 means we use PROCTITLE1/PROCTITLE2 pagelist tokens with 2 or less lines plstr = plstr.Replace(match, line); else svgGroup.Add(PageItemToSvgText(pageItem, line, yOffset)); diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index f57de720..d68c7b00 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1176,7 +1176,10 @@ namespace Volian.Print.Library if (aerTableOrFigure || itemInfo.RNOLevel != 0) // AER or RNO XOffset = MyParent.XOffset + MyParent.Width / 2 - Width / 2; else if (TableCenterPos != 0) + { XOffset = TableCenterPos; + XOffset = XOffset - (this.Width / 2) + (float)itemInfo.MyDocStyle.Layout.LeftMargin; + } else // Centered Table or Figure { // Add in 1/2 of the width of all RNO columns