diff --git a/PROMS/Formats/fmtall/BGEOI_00all.xml b/PROMS/Formats/fmtall/BGEOI_00all.xml index 9f205be8..91b2b338 100644 Binary files a/PROMS/Formats/fmtall/BGEOI_00all.xml and b/PROMS/Formats/fmtall/BGEOI_00all.xml differ diff --git a/PROMS/Formats/fmtall/BGEOIall.xml b/PROMS/Formats/fmtall/BGEOIall.xml index 2dc20fe2..e4c11162 100644 Binary files a/PROMS/Formats/fmtall/BGEOIall.xml and b/PROMS/Formats/fmtall/BGEOIall.xml differ diff --git a/PROMS/Formats/fmtall/BGESTPall.xml b/PROMS/Formats/fmtall/BGESTPall.xml index 64a301b1..3dd6aef0 100644 Binary files a/PROMS/Formats/fmtall/BGESTPall.xml and b/PROMS/Formats/fmtall/BGESTPall.xml differ diff --git a/PROMS/Formats/genmacall/bgeoi.svg b/PROMS/Formats/genmacall/bgeoi.svg index cd26c0ca..79e02a88 100644 Binary files a/PROMS/Formats/genmacall/bgeoi.svg and b/PROMS/Formats/genmacall/bgeoi.svg differ diff --git a/PROMS/Formats/genmacall/bgestp.svg b/PROMS/Formats/genmacall/bgestp.svg index 36a46b65..ebeaa995 100644 Binary files a/PROMS/Formats/genmacall/bgestp.svg and b/PROMS/Formats/genmacall/bgestp.svg differ diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index b0cc6e37..8642195e 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -2245,9 +2245,9 @@ namespace Volian.Print.Library offset += (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos; else { - float autoIndent = 0; SectionConfig sc = itemInfo.MyParent.MyConfig as SectionConfig; - offset = (sc != null && sc.SubSection_AutoIndent == "Y") ? MyParent.XOffset : MyParent.MyTab.XOffset; + offset = (sc != null && sc.SubSection_AutoIndent == "Y") ? MyParent.XOffset + : (MyParent.MyTab != null)?MyParent.MyTab.XOffset:XOffset; } } else diff --git a/PROMS/Volian.Print.Library/vlnTab.cs b/PROMS/Volian.Print.Library/vlnTab.cs index d707eb1c..eeca6b62 100644 --- a/PROMS/Volian.Print.Library/vlnTab.cs +++ b/PROMS/Volian.Print.Library/vlnTab.cs @@ -183,6 +183,8 @@ namespace Volian.Print.Library float? tPtPerChar1 = myparent.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.TabPtsPerChar; if (tPtPerChar1 != null) Width = (float)tPtPerChar1 * origTab.Length; + else if ((myparent.MyItemInfo.FormatStepData != null) && (myparent.MyItemInfo.FormatStepData.TabData.IdentWidth ?? 0) > 0) + Width = (float)myparent.MyItemInfo.FormatStepData.TabData.IdentWidth; else { origTab = origTab + " ";