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

Browse Source
This commit is contained in:
Kathy Ruffing
2012-06-04 12:41:32 +00:00
parent bd0c8e2157
commit f3675b7ed1
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -878,9 +878,10 @@ namespace Volian.Print.Library
private List<string> SplitText(string text, int len)
{
List<string> results = new List<string>();
int width = 0;
int start = 0;
int lastspace = 0;
int width = 0; // width of text, non-rtf
int start = 0; // start of line (index into string 'text'), includes rtf
int lastspace = 0; // location of lastspace (index into string 'text'), includes rtf
int startNonRtf = 0; // start of line, non-rtf (used for determining starting position to determine width if there was a break)
string rtfprefix = "";
string nextprefix = "";
for (int indx = 0; indx < text.Length; indx++)
@@ -919,6 +920,7 @@ namespace Volian.Print.Library
if (text[indx] == ' ')
{
lastspace = indx;
startNonRtf = width;
}
width++;
if (width > len)
@@ -928,7 +930,7 @@ namespace Volian.Print.Library
nextprefix = rtfprefix;
if (nextprefix != "") nextprefix += " ";
start = lastspace + 1;
width = 0;
width = (width - startNonRtf - 1) > 0 ? width - startNonRtf - 1 : 0;
lastspace = 0;
}
}

14
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@@ -364,6 +364,11 @@ namespace Volian.Print.Library
if (myMsg.IndexOf(@"%2d") > -1)
myMsg = myMsg.Replace(@"%2d", MyItemInfo.MyHLS.MyTab.CleanText.Trim(" .".ToCharArray()).PadLeft(2));
float msg_yLocation = 0;
if (myMsg.Contains("{par}"))
{
myMsg = myMsg.Replace("{par}", "");
msg_yLocation = -SixLinesPerInch;
}
switch (docstyle.Continue.Bottom.Location)
{
case E_ContBottomLoc.EndOfText: // place continue string at end of text
@@ -372,7 +377,7 @@ namespace Volian.Print.Library
break;
case E_ContBottomLoc.BottomOfPage: // place continue message at bottom of page
//msg_yLocation = yBottomMargin + 2 * SixLinesPerInch + (float)docstyle.Layout.FooterLength; // 2 lines above bottom margin
msg_yLocation = yBottomMargin + (float)docstyle.Layout.FooterLength;
msg_yLocation = msg_yLocation + yBottomMargin + (float)docstyle.Layout.FooterLength;
break;
default:
Console.WriteLine("**** BOTTOM CONTINUE MESSAGE NOT CODED*****");
@@ -1048,6 +1053,13 @@ namespace Volian.Print.Library
else
{
Rtf = GetRtf(itemInfo);
// Need the following with some modifications for WCNCKL format:
//if (Rtf.Contains("{Backspace}"))
//{
// XOffset -= 18;
// Width += 24;
// Rtf = Rtf.Replace("{Backspace}", "");
//}
if (itemInfo.IsTablePart) // Not for grid, this is for old-style tables.
{
Width = GetTableWidth(cb, IParagraph, MyItemInfo.MyDocStyle.Layout.PageWidth);