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

Browse Source
This commit is contained in:
Kathy Ruffing
2010-09-10 17:48:24 +00:00
parent b6ea14f1b3
commit 759824dd34
2 changed files with 81 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@@ -1243,7 +1243,7 @@ namespace VEPROMS.CSLA.Library
private static string ReplaceSpecialCharacters(string rtf)
{
string retval = rtf;
retval = retval.Replace("`", "\u00BA");// Degree
retval = retval.Replace("`", "\u00B0");// Degree
retval = Regex.Replace(retval, @"\\u[0-9]+[?]", new MatchEvaluator(ReplaceSpecialCharacter));
retval = Regex.Replace(retval, @"\\'[0-9A-Fa-f][0-9A-Fa-f]", new MatchEvaluator(ReplaceSpecialHexCharacter));
return retval;
@@ -1850,7 +1850,10 @@ namespace VEPROMS.CSLA.Library
if (!_TagsSetup) SetupTags();
return _MyHeader;
}
set { _MyHeader = value; }
set
{
_MyHeader = value;
}
}
[NonSerialized]
protected MetaTag _MyFooter;
@@ -1870,8 +1873,8 @@ namespace VEPROMS.CSLA.Library
if (IsStep)
{
MyTab = new Tab(AdjustForTextSubFollowsTextStyle(FormatStepData.TabData.Font));
MyHeader = new MetaTag(FormatStepData.TabData.Font);
MyFooter = new MetaTag(FormatStepData.TabData.Font);
_MyHeader = new MetaTag(FormatStepData.TabData.Font);
_MyFooter = new MetaTag(FormatStepData.TabData.Font);
SetTabText();
}
else
@@ -1971,7 +1974,7 @@ namespace VEPROMS.CSLA.Library
{
if (_MyHeader == null) _MyHeader = new MetaTag(FormatStepData.TabData.Font);
_MyHeader.Text = _MyHeader.CleanText = FormatStepData.Sep;
MyHeader.Justify = ContentAlignment.MiddleCenter;
_MyHeader.Justify = ContentAlignment.MiddleCenter;
}
#region Non HLP tab TODO
// other possible 'tokens'
@@ -2036,9 +2039,8 @@ namespace VEPROMS.CSLA.Library
// Handle the centered tab - if this tab is centered make it a header.
if (FormatStepData.TabData.Justify == "Center")
{
if (_MyHeader == null) _MyHeader = new MetaTag(FormatStepData.TabData.Font);
MyHeader.Justify = ContentAlignment.MiddleCenter;
MyHeader.Text = MyHeader.CleanText = tbformat.Trim(); ;
_MyHeader.Justify = ContentAlignment.MiddleCenter;
_MyHeader.Text = _MyHeader.CleanText = tbformat.Trim(); ;
// if there is only step in the group - no bullet is used, if more that one replace the tab
// with a bullet
@@ -2046,7 +2048,7 @@ namespace VEPROMS.CSLA.Library
tbformat = "";
else
{
if (MyPrevious != null) MyHeader = null;
if (MyPrevious != null) _MyHeader = null;
tbformat = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB;
if ((FormatStepData.TabData.Font.Style & E_Style.Underline) > 0)
{