Adjusted bottom continue message for formats CWE, CWE00, EXCLN, EXCLN00 and EXCLN01

Changed bottom continue message to be limited by the bottom margin.  Previously the continue message overlapped the border.
Removed Debug Output
Replaced Unit ID token "<ID>" in transition text for the section number.
This commit is contained in:
Rich 2014-02-21 12:45:05 +00:00
parent ddd973c83f
commit f62caf9669
3 changed files with 25 additions and 4 deletions

View File

@ -812,17 +812,17 @@ namespace VEPROMS.CSLA.Library
{
case 1:
tb.Append(" (Next Page)");
Console.WriteLine("Next Page: {0}", tb._FromItem.ShortPath);
//Console.WriteLine("Next Page: {0}", tb._FromItem.ShortPath);
break;
case -1:
tb.Append(" (Previous Page)");
Console.WriteLine("Prev Page: {0}", tb._FromItem.ShortPath);
//Console.WriteLine("Prev Page: {0}", tb._FromItem.ShortPath);
break;
case 0:
break;
default:
tb.Append(string.Format(" (Page {0})", tb._ToItem.PageNumber + 1));
Console.WriteLine("Page: {0}, {1}", tb._FromItem.ShortPath, tb._ToItem.PageNumber);
//Console.WriteLine("Page: {0}, {1}", tb._FromItem.ShortPath, tb._ToItem.PageNumber);
break;
}
}
@ -1060,7 +1060,8 @@ namespace VEPROMS.CSLA.Library
ItemInfo tmpitm = TranGetSectionItem(itminfo);
if (!tmpitm.IsSection) return "";
string str = tmpitm.MyContent.Number;
str = Regex.Replace(str, @"\<[uU]\>", itminfo.MyDocVersion.DocVersionConfig.Unit_Number);
str = Regex.Replace(str, @"\<U\>", itminfo.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase );
str = Regex.Replace(str, @"\<ID\>", itminfo.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
return (str);
}
private static string TranGetSectionTitle(TransitionBuilder tb, ItemInfo itminfo)

View File

@ -1287,9 +1287,20 @@ namespace fmtxml
break;
case "EXCLN.Y00":
AddEXCLN00Doc(ref dcstyles);
CWEDocFixCB(ref dcstyles);
break;
case "EXCLN.Y01":
CWEDocFixCB(ref dcstyles);
break;
case "EXCLN.DOC":
CWEDocFixCB(ref dcstyles);
break;
case "CWE.DOC":
AddCWEDoc(ref dcstyles);
CWEDocFixCB(ref dcstyles);
break;
case "CWE.Y00":
CWEDocFixCB(ref dcstyles);
break;
case "EXEDEV.DOC":
AddEXEDEVDoc(ref dcstyles);

View File

@ -114,6 +114,15 @@ namespace fmtxml
dcstyles.DcStyles[1].PageWidth = 579.2F;
dcstyles.DcStyles[1].PageLength = 578F;
}
private void CWEDocFixCB(ref DocStyles dcstyles)
{
for(int i=0;i<dcstyles.DcStyles.Length;i++)
{
DocStyle ds = dcstyles.DcStyles[i];
if (ds.CBLoc == 0 && ds.ContBottom != null)
dcstyles.DcStyles[i].CBLoc = 5;
}
}
private void AddEXEDEVDoc(ref DocStyles dcstyles)
{
dcstyles.DcStyles[0].LeftMargin = 36F;