Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

For Calvert, section/subsection xoffset was not considering autoindent flag setting on section property when printing section/subsection numbers and titles.

Browse Source
This commit is contained in:
Kathy Ruffing 2014-11-07 16:51:38 +00:00
parent b52c7098f9
commit 4fea758321
1 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -2238,11 +2238,24 @@ namespace Volian.Print.Library
MetaLevel++; MetaLevel++;
iilvl = iilvl.MyParent; iilvl = iilvl.MyParent;
} }
if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
{
if (MetaLevel == 1)
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;
}
}
else
{
MetaLevel = MetaLevel <= 2 ? 1 : MetaLevel - 1; MetaLevel = MetaLevel <= 2 ? 1 : MetaLevel - 1;
if (MetaLevel == 1) if (MetaLevel == 1)
offset += (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos; offset += (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos;
else if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
offset = MyParent.XOffset;
else else
{ {
xMetaAdj = (float)formatInfo.PlantFormat.FormatData.SectData.MetaSectionList[0].ColSByLevel; xMetaAdj = (float)formatInfo.PlantFormat.FormatData.SectData.MetaSectionList[0].ColSByLevel;
@ -2257,6 +2270,7 @@ namespace Volian.Print.Library
itemInfo.MyTab.CleanText = itemInfo.MyTab.CleanText.TrimEnd(" ".ToCharArray()); itemInfo.MyTab.CleanText = itemInfo.MyTab.CleanText.TrimEnd(" ".ToCharArray());
} }
} }
}
localXOffset = offset; localXOffset = offset;
} }
} }
@ -3827,6 +3841,12 @@ namespace Volian.Print.Library
level++; level++;
iilvl = iilvl.MyParent; iilvl = iilvl.MyParent;
} }
if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
{
XOffset = (myTab == null ? 0 : myTab.XOffset) + ((float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos - (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos);
}
else
{
level = level <= 2 ? 1 : level - 1; level = level <= 2 ? 1 : level - 1;
if (level == 1) if (level == 1)
XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (level * (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos); XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (level * (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos);
@ -3839,6 +3859,7 @@ namespace Volian.Print.Library
XOffset -= xMetaAdj; XOffset -= xMetaAdj;
} }
} }
}
else if (formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Just == "PSCenter") else if (formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Just == "PSCenter")
{ {
float hdrWidth = itemInfo.MyContent.Text.Length * 6; float hdrWidth = itemInfo.MyContent.Text.Length * 6;