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

Turn on indent of sub-sections in Table of Contents. Count the pages of the Cover, List of Effective Pages, and Table of Contents when generating the Table of Contents.

Browse Source 
Put a page number for the Valve List sections in the Table of Contents
Fix the bolded numbers problem in the Table of Contents
This commit is contained in:
John Jenko 2014-10-30 16:40:24 +00:00
parent 09c88e8948
commit 6f1d41879f
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/BGEOIall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BGESTPall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BGEVLall.xml
View File

Binary file not shown.

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

@ -512,11 +512,13 @@ namespace Volian.Print.Library
{ {
PageCount pc = MyPageHelper.MyTOCPageCounts[tocKey]; PageCount pc = MyPageHelper.MyTOCPageCounts[tocKey];
if (pc.Total == 0) if (pc.Total == 0)
{
pc.Total = MyPageHelper.CurrentTOCPageNumber + 1; pc.Total = MyPageHelper.CurrentTOCPageNumber + 1;
pc.DrawTemplates(); pc.DrawTemplates();
} }
} }
} }
}
if (!doprint) return yPageStart; if (!doprint) return yPageStart;
if (_PartsLeft != null && _PartsLeft.Count > 0) yPageStart = PartsLeft.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin); if (_PartsLeft != null && _PartsLeft.Count > 0) yPageStart = PartsLeft.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin);
if (_PartsRight != null && _PartsRight.Count > 0) yPageStart = PartsRight.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin); if (_PartsRight != null && _PartsRight.Count > 0) yPageStart = PartsRight.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin);
@ -2421,9 +2423,11 @@ namespace Volian.Print.Library
float addExtraSpace = 0; float addExtraSpace = 0;
if (MyItemInfo.FormatStepData != null && MyItemInfo.ActiveFormat.MyStepSectionLayoutData.CustomSpacing) if (MyItemInfo.FormatStepData != null && MyItemInfo.ActiveFormat.MyStepSectionLayoutData.CustomSpacing)
addExtraSpace = MyItemInfo.FormatStepData.StepLayoutData.STExtraSpace ?? 0; addExtraSpace = MyItemInfo.FormatStepData.StepLayoutData.STExtraSpace ?? 0;
if (MyItemInfo.MyParent != null && MyItemInfo.MyParent.FormatStepData != null && //if (MyItemInfo.MyParent != null && MyItemInfo.MyParent.FormatStepData != null &&
MyItemInfo.MyParent.FormatStepData.Type != "TitleWithTextRight") // MyItemInfo.MyParent.FormatStepData.Type != "TitleWithTextRight")
addExtraSpace = (MyItemInfo.FormatStepData == null) ? 0 : MyItemInfo.FormatStepData.StepLayoutData.STExtraSpace ?? 0; // addExtraSpace = (MyItemInfo.FormatStepData == null) ? 0 : MyItemInfo.FormatStepData.StepLayoutData.STExtraSpace ?? 0;
if (MyItemInfo.MyParent != null && MyItemInfo.MyParent.FormatStepData != null)
addExtraSpace = (MyItemInfo.MyParent.FormatStepData.Type == "TitleWithTextRight" || MyItemInfo.FormatStepData == null) ? 0 : MyItemInfo.FormatStepData.StepLayoutData.STExtraSpace ?? 0;
// If a high level step, the 16bit code uses the value of the extra space // If a high level step, the 16bit code uses the value of the extra space
// from the high level step format regardless of what type of high level step it is: // from the high level step format regardless of what type of high level step it is:
// Added check for UseSTExtraRealValue, if set, we want to use what is set for the specific step type // Added check for UseSTExtraRealValue, if set, we want to use what is set for the specific step type