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

Browse Source
This commit is contained in:
Kathy Ruffing 2013-02-01 15:02:08 +00:00
parent 9023e7c899
commit ca0d89faa9
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@ -104,8 +104,6 @@ namespace Volian.Print.Library
DrawMessages(writer.DirectContent); DrawMessages(writer.DirectContent);
if (!CreatingFoldoutPage) if (!CreatingFoldoutPage)
DrawRuler(writer.DirectContent); DrawRuler(writer.DirectContent);
if ((MySection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DontCountInTabOfCont) == 0)
CurrentTOCPageNumber++;
} }
else else
{ {
@ -113,9 +111,9 @@ namespace Volian.Print.Library
base.OnEndPage(writer, document); base.OnEndPage(writer, document);
if (!CreatingFoldoutPage) if (!CreatingFoldoutPage)
DrawRuler(writer.DirectContent); DrawRuler(writer.DirectContent);
if ((MySection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DontCountInTabOfCont) == 0)
CurrentTOCPageNumber++;
} }
if (MySection.MyDocStyle.StructureStyle.Style==null || (MySection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DontCountInTabOfCont) == 0)
CurrentTOCPageNumber++;
PageListTopCheckOffHeader = null; PageListTopCheckOffHeader = null;
PageListLastCheckOffHeader = null; PageListLastCheckOffHeader = null;
YMultiplier = 1; YMultiplier = 1;

18
PROMS/Volian.Print.Library/vlnTab.cs
View File

@ -168,12 +168,20 @@ namespace Volian.Print.Library
cleanTab = origTab; cleanTab = origTab;
if (CCCs != IIIs) if (CCCs != IIIs)
{ {
origTab = origTab + " ";
origTab = origTab.TrimStart(" ".ToCharArray()); if (myparent.MyItemInfo.ActiveFormat.Name.ToUpper().Contains("WST")) // Temporary for WST development. need better way to do this check
if (mindx>2) // ouch! {
Width = 6f * (origTab.Length - 1); // FPL (macro is after {numeric}) FPL is good with genmac output! Width = 6.8f * origTab.Length;
}
else else
Width = 3 + (6f * origTab.Length); // NSP (macro is before {numeric}) {
origTab = origTab + " ";
origTab = origTab.TrimStart(" ".ToCharArray());
if (mindx > 2) // ouch!
Width = 6f * (origTab.Length - 1); // FPL (macro is after {numeric}) FPL is good with genmac output!
else
Width = 3 + (6f * origTab.Length); // NSP (macro is before {numeric})
}
} }
else else
Width = GetTextWidth(MyFont, (cleanTab != null ? cleanTab : origTab), symblFontName);//MyFont.CharsToTwips * (cleanTab != null ? cleanTab.Length : origTab.Length); Width = GetTextWidth(MyFont, (cleanTab != null ? cleanTab : origTab), symblFontName);//MyFont.CharsToTwips * (cleanTab != null ? cleanTab.Length : origTab.Length);