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

Browse Source
This commit is contained in:
Kathy Ruffing 2012-08-08 12:23:26 +00:00
parent 68f3e7a0bb
commit 6713bac8d8
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,7 +439,7 @@ namespace Volian.Print.Library
// pagelist items in case there are some section items, for example the checkoff header needs // pagelist items in case there are some section items, for example the checkoff header needs
// to be processed for each section whether or not it is continuous. // to be processed for each section whether or not it is continuous.
SectionConfig.SectionPagination sPag = SectionConfig.SectionPagination.Separate; SectionConfig.SectionPagination sPag = SectionConfig.SectionPagination.Separate;
if (mySection.IsStepSection && mySection.MyPrevious != null && mySection.MyPrevious.IsStepSection) if (mySection.MyContent.Number.ToUpper() != "FOLDOUT" && mySection.IsStepSection && mySection.MyPrevious != null && mySection.MyPrevious.IsStepSection)
{ {
SectionConfig sc = mySection.MyConfig as SectionConfig; SectionConfig sc = mySection.MyConfig as SectionConfig;
sPag = sc.Section_Pagination; sPag = sc.Section_Pagination;
@ -586,7 +586,7 @@ namespace Volian.Print.Library
// If this is a continuous section, then the only pagelist items we want are section type since // If this is a continuous section, then the only pagelist items we want are section type since
// we are still on the same page. - CHECK IF ON SAME PAGE!!!! // we are still on the same page. - CHECK IF ON SAME PAGE!!!!
SectionConfig.SectionPagination sPag = SectionConfig.SectionPagination.Separate; SectionConfig.SectionPagination sPag = SectionConfig.SectionPagination.Separate;
if (section.IsStepSection && section.MyPrevious != null && section.MyPrevious.IsStepSection) if (section.IsStepSection && section.MyPrevious != null && section.MyPrevious.IsStepSection && section.MyContent.Number.ToUpper() != "FOLDOUT")
{ {
SectionConfig sc = section.MyConfig as SectionConfig; SectionConfig sc = section.MyConfig as SectionConfig;
sPag = sc.Section_Pagination; sPag = sc.Section_Pagination;
@ -830,15 +830,14 @@ namespace Volian.Print.Library
// Otherwise determine how many line to split the text into // Otherwise determine how many line to split the text into
List<string> titleLines = SplitText(title, (int)len); List<string> titleLines = SplitText(title, (int)len);
// if the token was proctitle, dont' adjust. If the token was PROCTITLE1/2 then // Adjust y location based on which pagelist token & how many lines. Proctitle1 is adjusted if
// move down 6. // there are more than 2 lines (proctitle1 should have it's own y location that is used if there are 1 or 2 lines.)
int adj = pageItem.Token.Contains("1") || pageItem.Token.Contains("2") ? 0 : -6; float yOffset = (pageItem.Token.Contains("1") && titleLines.Count <= 2) ? 0 : (-6 * (titleLines.Count - 1));
float yOffset = adj * (titleLines.Count - 1);
int cnt = 0; int cnt = 0;
foreach (string line in titleLines) foreach (string line in titleLines)
{ {
cnt++; cnt++;
if (cnt == 1 && adj == 0) // adj == 0 means we use PROCTITLE1/PROCTITLE2 pagelist tokens if (cnt == 1 && yOffset == 0) // adj == 0 means we use PROCTITLE1/PROCTITLE2 pagelist tokens with 2 or less lines
plstr = plstr.Replace(match, line); plstr = plstr.Replace(match, line);
else else
svgGroup.Add(PageItemToSvgText(pageItem, line, yOffset)); svgGroup.Add(PageItemToSvgText(pageItem, line, yOffset));

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

@ -1176,7 +1176,10 @@ namespace Volian.Print.Library
if (aerTableOrFigure || itemInfo.RNOLevel != 0) // AER or RNO if (aerTableOrFigure || itemInfo.RNOLevel != 0) // AER or RNO
XOffset = MyParent.XOffset + MyParent.Width / 2 - Width / 2; XOffset = MyParent.XOffset + MyParent.Width / 2 - Width / 2;
else if (TableCenterPos != 0) else if (TableCenterPos != 0)
{
XOffset = TableCenterPos; XOffset = TableCenterPos;
XOffset = XOffset - (this.Width / 2) + (float)itemInfo.MyDocStyle.Layout.LeftMargin;
}
else // Centered Table or Figure else // Centered Table or Figure
{ {
// Add in 1/2 of the width of all RNO columns // Add in 1/2 of the width of all RNO columns