BGE: Handle {} around ro values

BGE: Added an x-Location of end message for a section
Use x-location of end message for a section; tab format for sequential tabs at 4th level; hls tab spaces; indent in transition format 9
BGE: Use x-location of end message for a section
BGE: support for top continue messages that contain tab for continued step
resolve {Step Text} token in transition; modify code that processes transition format to use collection matches rather than search for ‘{‘
support AllUnits ro flag
support ‘{‘ and ‘}’ around ro value
top continue message with tab; location of top continue message in both AER/RNO columns for dual column; support indent in transition format during print
support two top continue messages (aer/rno) that can have different text; fix bug in splitting procedure title text if it contains hard spaces
This commit is contained in:
2014-04-29 13:12:10 +00:00
parent c62a63b151
commit f332618227
11 changed files with 167 additions and 46 deletions

View File

@@ -32,13 +32,18 @@ namespace Volian.Print.Library
get { return _CheckListBoxes; }
set { _CheckListBoxes = value; }
}
private vlnText _TopMessage;
public vlnText TopMessage
{
get { return _TopMessage; }
set { _TopMessage = value; }
}
private vlnText _TopMessageR; // Added if there are 2 messages, in AER AND RNO (for BGE)
public vlnText TopMessageR
{
get { return _TopMessageR; }
set { _TopMessageR = value; }
}
private vlnText _BottomMessage;
public vlnText BottomMessage
{
@@ -387,6 +392,11 @@ namespace Volian.Print.Library
TopMessage.ToPdf(cb, 0, ref tmp, ref tmp);
TopMessage = null; // Only output it once.
}
if (TopMessageR != null)
{
TopMessageR.ToPdf(cb, 0, ref tmp, ref tmp);
TopMessageR = null; // Only output it once.
}
if (BottomMessage != null)
{
BottomMessage.ToPdf(cb, 0, ref tmp, ref tmp);
@@ -1617,9 +1627,9 @@ namespace Volian.Print.Library
indx += m.Length - 1;
width++;
}
else
else
{
m = Regex.Match(text.Substring(indx), @"^\\[uU][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][?]");
m = Regex.Match(text.Substring(indx), @"^\\[uU][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][?]"); // 3 char unicode, for example \u160? (hardspace)
if (m.Success)
{
indx += m.Length - 1;
@@ -1627,11 +1637,20 @@ namespace Volian.Print.Library
}
else
{
m = Regex.Match(text.Substring(indx), @"^\\[^ ]*? ");
m = Regex.Match(text.Substring(indx), @"^\\[uU][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][a-fA-F0-9][?]");
if (m.Success)
{
indx += m.Length - 1;
rtfprefix = AdjustRtfPrefix(rtfprefix, m.Value);
width++;
}
else
{
m = Regex.Match(text.Substring(indx), @"^\\[^ ]*? ");
if (m.Success)
{
indx += m.Length - 1;
rtfprefix = AdjustRtfPrefix(rtfprefix, m.Value);
}
}
}
}