From ad1980e43464d4d847d5fb803d24123648cc22bf Mon Sep 17 00:00:00 2001
From: Rich <rmark@volian.com>
Date: Wed, 20 Jan 2016 20:19:53 +0000
Subject: [PATCH] Added option to Remove Trailing Hard Returns and Manual Page
 Breaks

---
 PROMS/Volian.Print.Library/Pagination.cs   |  6 ++++--
 PROMS/Volian.Print.Library/PromsPrinter.cs | 19 +++++++++++++++++--
 PROMS/Volian.Print.Library/vlnParagraph.cs |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs
index b2fa4c76..54cc1004 100644
--- a/PROMS/Volian.Print.Library/Pagination.cs
+++ b/PROMS/Volian.Print.Library/Pagination.cs
@@ -170,7 +170,9 @@ namespace Volian.Print.Library
 					// on that first step.
 					StepConfig sc = firstChild.MyItemInfo.MyConfig as StepConfig;
 					ManualPageBreak = MyPageHelper.OriginalPageBreak ? (sc == null ? false : sc.Step_ManualPagebreak) :
-						sc == null ? false : sc.Step_NewManualPagebreak;
+						sc == null ? false : 
+						MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndManualPageBreaks ? false : sc.Step_NewManualPagebreak;
+					
 					if (ManualPageBreak)
 					{
 						SectionPageBreak = true;
@@ -292,7 +294,7 @@ namespace Volian.Print.Library
 			//Console.WriteLine("{0} Paginate", MyPageHelper.HLSText);
 			StepConfig sc1 = MyItemInfo.MyConfig as StepConfig;
 			ManualPageBreak = MyPageHelper.OriginalPageBreak ? (sc1 == null ? false : sc1.Step_ManualPagebreak) :
-				sc1 == null ? false : sc1.Step_NewManualPagebreak;
+				sc1 == null ? false : MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndManualPageBreaks ? false : sc1.Step_NewManualPagebreak;
 			if (MyItemInfo.FirstSibling == MyItemInfo && ManualPageBreak)
 			{
 				// if parent/section used this pagebreak, skip it.
diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs
index 13434103..59b68be3 100644
--- a/PROMS/Volian.Print.Library/PromsPrinter.cs
+++ b/PROMS/Volian.Print.Library/PromsPrinter.cs
@@ -92,6 +92,13 @@ namespace Volian.Print.Library
 			get { return _SaveLinks; }
 			set { _SaveLinks = value; }
 		}
+		private bool _RemoveTrailingHardReturnsAndManualPageBreaks = false;
+		public bool RemoveTrailingHardReturnsAndManualPageBreaks
+		{
+			get { return _RemoveTrailingHardReturnsAndManualPageBreaks; }
+			set { _RemoveTrailingHardReturnsAndManualPageBreaks = value; }
+		}
+
 		private string _Prefix = ""; // RHM20150506 Multiline ItemID TextBox
 		public string Prefix
 		{
@@ -214,7 +221,7 @@ namespace Volian.Print.Library
 			set { _MyReaderHelper = value; }
 		}
 		public PromsPrinter(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, string backgroundFolder, bool openPDF, bool overWrite, 
-			ChangeBarDefinition cbd, String pdfFile, bool insertBlankPages, bool batchPrint, string prefix, bool saveLinks)
+			ChangeBarDefinition cbd, String pdfFile, bool insertBlankPages, bool batchPrint, string prefix, bool saveLinks, bool removeTrailngHardReturnsAndManualPageBreaks)
 		{
 			Prefix = prefix; // RHM20150506 Multiline ItemID TextBox
 			_MyItem = myItem;
@@ -231,6 +238,7 @@ namespace Volian.Print.Library
 			_BatchPrint = batchPrint;
 			_MyReaderHelper = new ReaderHelper(this);
 			_SaveLinks = saveLinks;
+			_RemoveTrailingHardReturnsAndManualPageBreaks = removeTrailngHardReturnsAndManualPageBreaks;
 			//_MyReaderHelper.LoadTree(myItem);
 		}
 		private string _BeforePageNumberPdf = null;
@@ -268,7 +276,14 @@ namespace Volian.Print.Library
 							FileInfo fi = new FileInfo(retstr);
 							FileInfo fidest = new FileInfo(di1.FullName + @"\" + fi.Name);
 							if (fidest.Exists) fidest.Delete();
-							fi.MoveTo(di1.FullName + @"\" + fi.Name);
+							try
+							{
+								fi.MoveTo(di1.FullName + @"\" + fi.Name);
+							}
+							catch(Exception ex)
+							{
+								_MyLog.ErrorFormat("{0} During Save {1}", ex.GetType().FullName, ex.Message);
+							}
 							ClearTransPageNumProblems();
 							RefreshPageNumber(_MyItem);
 							ProcedureInfo.RefreshPageNumTransitions(_MyItem as ProcedureInfo);
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index 3b792532..5e4d11ff 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -4444,7 +4444,7 @@ namespace Volian.Print.Library
 		{
 			int profileDepth = ProfileTimer.Push(">>>> GetRtf");
 			_RtfSB = new StringBuilder();
-			DisplayText vlntxt = new DisplayText(itemInfo, E_EditPrintMode.Print, E_ViewMode.View, true, E_FieldToEdit.StepText, false, prefix, suffix);
+			DisplayText vlntxt = new DisplayText(itemInfo, E_EditPrintMode.Print, E_ViewMode.View, true, E_FieldToEdit.StepText, false, prefix, suffix,MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndManualPageBreaks);
 			System.Drawing.Font myFont = vlntxt.TextFont.WindowsFont;
 			if (!itemInfo.IsTable && StepRTB.MyFontFamily != null)
 				myFont = new System.Drawing.Font(StepRTB.MyFontFamily, myFont.Size, myFont.Style);