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

fixed a problem where the ‘Page x of y’, or any page list item that had text & one or more tokens, was bolding when it should not be bolded

Browse Source
This commit is contained in:
Kathy Ruffing 2014-06-30 12:20:38 +00:00
parent 9fb17c103c
commit c9cdc35ff2
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1013,7 +1013,7 @@ namespace Volian.Print.Library
}
if (val != null && val != "" && !PgLogicals.ContainsKey(pstok)) PgLogicals.Add(pstok, val != null);
//if (val == null || val == "")
//val = " ";
//val = " ";
if (val == null)
val = "";
plstr = plstr.Replace(token, val);
@ -1032,7 +1032,9 @@ namespace Volian.Print.Library
}
}
else
ProcessPaglistToken(section, svgGroup, pageItem, ref useFontForCheckOffHeader, ref plstr, token);
{
if (!ProcessPaglistToken(section, svgGroup, pageItem, ref useFontForCheckOffHeader, ref plstr, token)) break;
}
} // end foreach matches
if (plstr.StartsWith("RO_Lookup("))
{
@ -1109,8 +1111,22 @@ namespace Volian.Print.Library
get { return _HLRNO; }
set { _HLRNO = value; }
}
private void ProcessPaglistToken(VEPROMS.CSLA.Library.SectionInfo section, SvgGroup svgGroup, VEPROMS.CSLA.Library.PageItem pageItem, ref VE_Font useFontForCheckOffHeader, ref string plstr, string token)
/// <summary>
/// </summary>
/// <param name="section"></param>
/// <param name="svgGroup"></param>
/// <param name="pageItem"></param>
/// <param name="useFontForCheckOffHeader"></param>
/// <param name="plstr"></param>
/// <param name="token"></param>
/// <returns>
/// true - if token is resolved
/// false - if entire text is processed
/// </returns>
private bool ProcessPaglistToken(VEPROMS.CSLA.Library.SectionInfo section, SvgGroup svgGroup, VEPROMS.CSLA.Library.PageItem pageItem, ref VE_Font useFontForCheckOffHeader, ref string plstr, string token)
{
bool retval = true;
//Console.WriteLine("{0} ProcessPagelistToken", token);
// Paglist token inside a PS= conditional are surrounded by square brackets instead of curley
// ex. [BOX3] instead of {BOX3}, thus the redunant looking cases
@ -1515,12 +1531,17 @@ namespace Volian.Print.Library
else
{
if (plstr != "")
{
svgGroup.Add(PageItemToSvgText(pageItem, plstr, MySection));
plstr = "";
}
//svgGroup.Add(PageItemToSvgText(pageItem, pageItem.Token));
}
//_MyLog.InfoFormat("Token not processed {0}", token);
if (plstr == "") retval = false;
break;
}
return retval;
}
private string GetAttachNum1()