From f32971b8d48cbbec072e035453491e03075f1cb8 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 15 Jul 2014 20:29:50 +0000 Subject: [PATCH] =?UTF-8?q?Declared=20the=20format=20variable=20TabPtsPerC?= =?UTF-8?q?har=20as=20a=20=E2=80=9Cfloat=3F=E2=80=9D=20so=20that=20it=20ca?= =?UTF-8?q?n=20have=20a=20null=20value=20Fixed=20the=20RTF=20commands=20fo?= =?UTF-8?q?r=20the=20OR,=20AND,=20THEN,=20and=20WHEN=20replacewords=20Adde?= =?UTF-8?q?d=20logic=20so=20that=20TabPtsPerChar=20is=20not=20added=20to?= =?UTF-8?q?=20a=20format=20if=20the=20value=20is=20NULL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/fmtxml/FmtFileToXml.cs | 4 ++-- PROMS/fmtxml/PlantSpecific_WolfCreak.cs | 6 +++--- PROMS/fmtxml/TranslateFMT.XSL | Bin 214006 -> 214026 bytes 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 99e700e9..1bd9bb57 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -755,7 +755,7 @@ public struct StepSectionLayout public Int16 HLSWidthOVRD; public Int16 SubPaginationWght; public Int16 TextTitleAdjustment; - public float TabPtsPerChar; // added for BGE + public float? TabPtsPerChar; // added for BGE public string TableCenterPos; // string array with floats. public string LowerLimitDivisor; // pagination - should it be in print? - 16bit: quoted float public string NonLinkedStepNumber; @@ -4466,7 +4466,7 @@ namespace fmtxml if (success) { PushStepLists(subdata.StepData); - DoStepInheritance(ref subdata.StepData,fname); + DoStepInheritance(ref subdata.StepData, fname); AddPlantSpecificOverrideInheritance(fmtName, ref subdata); PopStepLists(); } diff --git a/PROMS/fmtxml/PlantSpecific_WolfCreak.cs b/PROMS/fmtxml/PlantSpecific_WolfCreak.cs index 2391a3ab..c6734510 100644 --- a/PROMS/fmtxml/PlantSpecific_WolfCreak.cs +++ b/PROMS/fmtxml/PlantSpecific_WolfCreak.cs @@ -17,10 +17,10 @@ namespace fmtxml // replace words fmtdata.SectData.ReplaceStrData[0].ReplaceWith = @"\b \ul IF\ulnone \b0 "; - fmtdata.SectData.ReplaceStrData[2].ReplaceWith = @"\par}\b \ul THEN\ulnone \b0 "; + fmtdata.SectData.ReplaceStrData[2].ReplaceWith = @"{\par}\b \ul THEN\ulnone \b0 "; fmtdata.SectData.ReplaceStrData[3].ReplaceWith = @"\b \ul WHEN\ulnone \b0 "; - fmtdata.SectData.ReplaceStrData[4].ReplaceWith = @"\par}\b \ul AND\ulnone \b0 "; - fmtdata.SectData.ReplaceStrData[5].ReplaceWith = @"\par}\b \ul OR\ulnone \b0 "; + fmtdata.SectData.ReplaceStrData[4].ReplaceWith = @"{\par}\b \ul AND\ulnone \b0 "; + fmtdata.SectData.ReplaceStrData[5].ReplaceWith = @"{\par}\b \ul OR\ulnone \b0 "; } private void AddWCN2Fmt(ref FormatData fmtdata) { diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index e771d3b0d157fc7e51277cfd0ed1efdac0bb5121..538d303c705c68629b209b5d15656d0f09cb16ef 100644 GIT binary patch delta 45 zcmey?&fC?&+pvYvFGg5_A(0`EA%#JKL61R^!InXtL4C3#r)7Iv4CD5;7^Z^f02@6F ATL1t6 delta 25 gcmeC`;QiLl+pvYvFJ`hsDo=Y}4CD5^7^XST0fW#AB>(^b