From 8ef73fe7b52c8a6de2cffd675b9dc2f0fa782fe5 Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 21 Feb 2014 12:46:09 +0000 Subject: [PATCH] Added a new Bottom Continue Message location which limits the message to the bottom margin. Changed bottom continue message to be limited by the bottom margin. Previously the continue message overlapped the border. --- PROMS/VEPROMS.CSLA.Library/Format/ENums.cs | 3 ++- PROMS/Volian.Print.Library/vlnParagraph.cs | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs index 76b5a9f0..3b6f968f 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs @@ -116,7 +116,8 @@ namespace VEPROMS.CSLA.Library EndOfText = 0, BtwnTextAndBottom = 1, BottomOfPage = 2, - BelowBottom1 = 3 + BelowBottom1 = 3, + EndOfText2 = 5 }; [Flags] public enum E_DocStructStyle : ulong diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index c4b4f767..cdceccc7 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -912,6 +912,9 @@ namespace Volian.Print.Library case E_ContBottomLoc.BelowBottom1: msg_yLocation = msg_yLocation + yBtmMarginForMsg; break; + case E_ContBottomLoc.EndOfText2: // Like EndOfText but limited within yBottomMargin + msg_yLocation = Math.Max(msg_yLocation + yLocation - SixLinesPerInch, yBottomMargin + SixLinesPerInch); + break; default: Console.WriteLine("**** BOTTOM CONTINUE MESSAGE NOT CODED*****"); break;