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

B2018-042 the property class was not printing on all of the pages it needed to be

Browse Source 
B2018-041 Setpoints were not being uppercased when they followed a dash character
This commit is contained in:
John Jenko 2018-03-02 16:59:27 +00:00
parent 60b83e9926
commit 09aa4e4ab0
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/wst2all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/wstdcsall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/wstsamall.xml
View File

Binary file not shown.

16
PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
View File

@ -179,13 +179,6 @@ namespace VEPROMS.CSLA.Library
@"\par\par\par "); @"\par\par\par ");
} }
} }
// Replace Hard Hyphens with normal hyphen so the PDF search for hyphens will work properly
if (text.Contains(@"\u8209?") && epMode == E_EditPrintMode.Print)
{
// Handle RTF Tokens followed immediately by a hard hyphen
text =Regex.Replace(text, @"(?<=\\[^\\?' \r\n\t]+)\\u8209\?", " -");
text = text.Replace(@"\u8209?", "-");
}
// Replace backslash symbol with normal backslash so the PDF search for backslashes will work properly // Replace backslash symbol with normal backslash so the PDF search for backslashes will work properly
if (text.Contains(@"\u9586?") && epMode == E_EditPrintMode.Print) if (text.Contains(@"\u9586?") && epMode == E_EditPrintMode.Print)
{ {
@ -282,6 +275,15 @@ namespace VEPROMS.CSLA.Library
} }
} }
// B2018-041 moved this logic here from DisplayText() so the it does not defeat the Upcase RO's after Dash logic
// Replace Hard Hyphens with normal hyphen so the PDF search for hyphens will work properly
if (text.Contains(@"\u8209?") && epMode == E_EditPrintMode.Print)
{
// Handle RTF Tokens followed immediately by a hard hyphen
text = Regex.Replace(text, @"(?<=\\[^\\?' \r\n\t]+)\\u8209\?", " -");
text = text.Replace(@"\u8209?", "-");
}
// if in print mode, view mode, or non-active richtextbox do replace words. Only if in // if in print mode, view mode, or non-active richtextbox do replace words. Only if in
// actual edit mode are replace words left as is. // actual edit mode are replace words left as is.
// But don't do ReplaceWords if the TurnOffReplaceWords format flag is set // But don't do ReplaceWords if the TurnOffReplaceWords format flag is set