From 85a8a26504530fbe7954233c0672e254bbe6c07a Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Tue, 18 Nov 2014 15:12:23 +0000
Subject: [PATCH] =?UTF-8?q?added=20Docstyle=20format=20flag=20DSS=5FWordCo?=
 =?UTF-8?q?ntentLandscaped=20to=20flag=20that=20Word=20content=20is=20land?=
 =?UTF-8?q?scaped=20don=E2=80=99t=20change=20level=20for=20steps=20under?=
 =?UTF-8?q?=20sequentials=20(only=20under=20notes/cautions/equipment=20lis?=
 =?UTF-8?q?ts)=20use=20Docstyle=20format=20flag=20DSS=5FWordContentLandsca?=
 =?UTF-8?q?ped=20to=20make=20End=20message=20landscaped?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/Formats/fmtall/WCN1all.xml              | Bin 88186 -> 88240 bytes
 .../VEPROMS.CSLA.Library/Extension/ItemExt.cs |   3 ++-
 PROMS/VEPROMS.CSLA.Library/Format/ENums.cs    |   1 +
 PROMS/Volian.Print.Library/PromsPrinter.cs    |   8 ++++++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/PROMS/Formats/fmtall/WCN1all.xml b/PROMS/Formats/fmtall/WCN1all.xml
index 8355feb901b008a9f4614e73043cc7f6f7433bad..bd84d1bdcd9deacf0b7142d40937264bb42532af 100644
GIT binary patch
delta 81
zcmeyhfpx=1)`l&NZr+AE3<?Y`48cGc&k)X#&rrmW!r%;~^B77PQo*DTLn4q)VJK!u
c2C@n!H^z%j-{8b(H(gGYQDyrMZ^lDB09yPN2LJ#7

delta 27
jcmdn6k@eRG)`l&NZr;-uI5GN7mlI`F+5XO(@emIHo|Fnw

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index f9d9745e..d0dc8a56 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -2930,7 +2930,8 @@ namespace VEPROMS.CSLA.Library
 
 			// Check to be sure the parent tab should be included...  If this sequential is within a note
 			// or caution or equipment list, don't use parent tab AND always start the numbering as a numeric
-			if (doMeta && IsSequential && (InNote() || InCaution() || MyParent.IsEquipmentList))
+			if (doMeta && IsSequential && (InNote() || InCaution() || 
+				(MyParent.IsEquipmentList && !MyParent.FormatStepData.TabData.IdentPrint.Contains("{seq}"))))
 			{
 				// if immediate parent is note, caution or equip, use numeric, otherwise use alpha.
 				localPrintLevel = 0;
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs
index 1b1ba6a1..db58df04 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs
@@ -168,6 +168,7 @@ namespace VEPROMS.CSLA.Library
 		DSS_DontDoCheckOffs = 0x100000000,	// format has checkoffs, but don't do for this section
 		DSS_PageListSpBckgrnd = 0x200000000,	// this background document style has special formatting: margins, title with cont and non underlined header (IP2BCK)
 		DSS_PageListAddSectCont = 0x400000000,   // for this section, add the top continue message when doing the ATTACHTITLECONT pagelist token (Calvert/Landscape word docs)
+		DSS_WordContentLandscaped = 0x800000000,	// for this section, the word content is landscaped.
 	};
 	public enum E_DocStyleUse : uint
 	{
diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs
index a4b7f9f9..43afa200 100644
--- a/PROMS/Volian.Print.Library/PromsPrinter.cs
+++ b/PROMS/Volian.Print.Library/PromsPrinter.cs
@@ -723,7 +723,15 @@ namespace Volian.Print.Library
 								float wtpm = (float)mySection.MyDocStyle.Layout.PageWidth - (float)mySection.MyDocStyle.Layout.LeftMargin;
 								float centerpos = (float)mySection.MyDocStyle.Layout.LeftMargin + (wtpm - (mySection.MyDocStyle.End.Message.Length * mySection.MyDocStyle.End.Font.CharsToTwips)) / 2;
 								float yBottomMargin = Math.Max(0, (float)mySection.MyDocStyle.Layout.TopMargin - (float)mySection.MyDocStyle.Layout.PageLength - 2 * vlnPrintObject.SixLinesPerInch);
+								bool landscape = (mySection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_WordContentLandscaped) == E_DocStructStyle.DSS_WordContentLandscaped;
+								if (landscape)
+								{
+									cb.SaveState();
+									System.Drawing.Drawing2D.Matrix myMatrix = new System.Drawing.Drawing2D.Matrix(0, 1, -1, 0, cb.PdfDocument.PageSize.Height, 0);
+									cb.Transform(myMatrix);
+								}
 								Rtf2Pdf.TextAt(cb, para, centerpos, ylocation + 6, 100, 12, "", yBottomMargin);
+								if (landscape) cb.RestoreState();
 							}
 						}
 						OnStatusChanged("Merge MSWord", PromsPrinterStatusType.MergeMSWord);