From bfeb5eeb15ac3ccd6e8dca4a65d73de5e2754ef8 Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 23 Apr 2013 13:39:05 +0000 Subject: [PATCH] --- PROMS/Volian.Print.Library/vlnParagraph.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index dc6fe38d..e93aed20 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -642,7 +642,7 @@ namespace Volian.Print.Library msg_yLocation = msg_yLocation + yLocation - SixLinesPerInch; break; case E_ContBottomLoc.BtwnTextAndBottom: // place continue string between end of text & bottom of page - Console.WriteLine("Not done yet"); + msg_yLocation = msg_yLocation + yLocation - ((yLocation - yBottomMargin) / 2); break; case E_ContBottomLoc.BottomOfPage: // place continue message at bottom of page //msg_yLocation = yBottomMargin + 2 * SixLinesPerInch + (float)docstyle.Layout.FooterLength; // 2 lines above bottom margin @@ -1493,11 +1493,18 @@ namespace Volian.Print.Library while (hls1.MyParent != null && !hls1.MyItemInfo.IsHigh) hls1 = hls1.MyParent; float colR = float.Parse(formatInfo.MyStepSectionLayoutData.ColRTable.Split(",".ToCharArray())[itemInfo.ColumnMode]); float xLowerLimit = hls1.PartsLeft != null && hls1.PartsLeft.Count > 0 ? hls1.PartsLeft[0].XOffset : hls1.XOffset; - float xUpperLimit = hls1.XOffset + hls1.Width + colR * itemInfo.ColumnMode; + float xUpperLimit = 0; + float pageWidth = ((float)itemInfo.MyActiveSection.MyDocStyle.Layout.PageWidth); + + if (itemInfo.IsInRNO) + // if in rno column, the upper limit is width of the page (right margin). Subtract off size of a character + xUpperLimit = pageWidth - (72 / (float)MyItemInfo.FormatStepData.Font.CPI); + else + xUpperLimit = hls1.XOffset + hls1.Width + colR * itemInfo.ColumnMode; + float TableCenterPos = float.Parse(formatInfo.MyStepSectionLayoutData.TableCenterPos.Split(",".ToCharArray())[itemInfo.ColumnMode]); if (formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.TieTabToLevel) { - float pageWidth = ((float)itemInfo.MyActiveSection.MyDocStyle.Layout.PageWidth); //* (float)MyItemInfo.FormatStepData.Font.CPI / 12; float leftMargin = ((float)itemInfo.MyActiveSection.MyDocStyle.Layout.LeftMargin); //* (float)MyItemInfo.FormatStepData.Font.CPI / 12; XOffset = leftMargin + (pageWidth - leftMargin - Width) / 2; }