Fix page number transitions that were counting foldout pages (should not count those) for AEP
Implement [UNIT] page list token (AEP) Added property to track page numbers without foldouts for page num transitions (AEP)
This commit is contained in:
parent
05b910a8e6
commit
6f1f63e14f
@ -1792,6 +1792,10 @@ namespace Volian.Print.Library
|
||||
revUnit += "/Unit 1";
|
||||
plstr = plstr.Replace(token, revUnit);
|
||||
break;
|
||||
case "[UNIT]":
|
||||
string un = MySection.MyDocVersion.DocVersionConfig.Print_UnitNumberForPageList;
|
||||
plstr = plstr.Replace(token, un);
|
||||
break;
|
||||
default:
|
||||
if (token.Contains(@"RO-"))
|
||||
{
|
||||
|
@ -461,8 +461,13 @@ namespace Volian.Print.Library
|
||||
// MyItemInfo.ShortPath, MyItemInfo.FormatStepData.TabData.IdentPrint, MyItemInfo.FormatStepData.TabData.IdentEdit);
|
||||
//
|
||||
if (MyItemInfo.IsFootnote && Processed) return yPageStart;
|
||||
if (MyItemInfo.PageNumber == 0) MyItemInfo.PageNumber = MyPageHelper.CurrentPageNumber;
|
||||
else if (MyItemInfo.PageNumberUsed != 0 && MyItemInfo.PageNumberUsed != MyPageHelper.CurrentPageNumber)
|
||||
int pagenumTran = 0;
|
||||
if ((MyItemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DontCountFoldoutPgs) == E_DocStructStyle.DontCountFoldoutPgs)
|
||||
pagenumTran = MyPageHelper.CurrentPageNumberNoFoldouts;
|
||||
else
|
||||
pagenumTran = MyPageHelper.CurrentPageNumber;
|
||||
if (MyItemInfo.PageNumber == 0) MyItemInfo.PageNumber = pagenumTran;
|
||||
else if (MyItemInfo.PageNumberUsed != 0 && MyItemInfo.PageNumberUsed != pagenumTran)
|
||||
{
|
||||
if (PromsPrinter.TransPageNumProblems == null) PromsPrinter.TransPageNumProblems = new List<string>();
|
||||
PromsPrinter.TransPageNumProblems.Add(MyItemInfo.ShortPath);
|
||||
|
@ -967,6 +967,12 @@ namespace Volian.Svg.Library
|
||||
get { return _CurrentPageNumber; }
|
||||
set { _CurrentPageNumber = value; }
|
||||
}
|
||||
private int _CurrentPageNumberNoFoldouts = 0;
|
||||
public int CurrentPageNumberNoFoldouts
|
||||
{
|
||||
get { return _CurrentPageNumberNoFoldouts; }
|
||||
set { _CurrentPageNumberNoFoldouts = value; }
|
||||
}
|
||||
private int _CurrentTOCPageNumber = 0;
|
||||
public int CurrentTOCPageNumber
|
||||
{
|
||||
@ -1023,6 +1029,7 @@ namespace Volian.Svg.Library
|
||||
if (DoZoomOMatic) DrawZoomOMatic(writer.DirectContent);
|
||||
}
|
||||
CurrentPageNumber++;
|
||||
CurrentPageNumberNoFoldouts++;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user