This commit is contained in:
Kathy Ruffing 2012-10-26 10:10:35 +00:00
parent 8284c66da2
commit 94d2b11dc3
3 changed files with 12 additions and 3 deletions

View File

@ -323,6 +323,9 @@ namespace fmtxml
case "NSP.PAG": case "NSP.PAG":
AddNSPPage(ref pgstyles); AddNSPPage(ref pgstyles);
break; break;
case "SHE.PAG":
AddSHEPage(ref pgstyles);
break;
/* Under Development /* Under Development
case "TP.PAG": case "TP.PAG":
AddTPPage(ref pgstyles); AddTPPage(ref pgstyles);
@ -333,6 +336,12 @@ namespace fmtxml
* */ * */
} }
} }
private void AddSHEPage(ref PageStyles pgstyles)
{
// Procedure Steps
pgstyles.PgStyles[0].Items[1].Col = 78; // Column for BOX5 needed adjusted to match 16bit
}
// NSP_ALL // NSP_ALL
private void AddNSPPage(ref PageStyles pgstyles) private void AddNSPPage(ref PageStyles pgstyles)
{ {

View File

@ -4726,12 +4726,12 @@ namespace fmtxml
//Macros //Macros
// <!diamond> - draws a diamond around the stepnumber // <!diamond> - draws a diamond around the stepnumber
// <!diamond1> - A macro // <!diamond1> - A macro
// <!asterisk> // <!asterisk> for SHE (Shearon Harris) format. Convert to just a tab with asterisk.
// <> - ignored // <> - ignored
// \241 - circle macro around step, same as <!circle> // \241 - circle macro around step, same as <!circle>
// Also note, the format files had "<>", these get converted during input in this // Also note, the format files had "<>", these get converted during input in this
// format converter code. // format converter code.
wkstr = wkstr.Replace("{!asterisk}", "\\fs10 \\b*\\b0"); // was font size 20 in 16-bit if (wkstr.Contains("!asterisk")) wkstr = "{asterisk} {numeric}. ";
wkstr = Regex.Replace(wkstr, @"{![.*?]}", @"{!$1}"); wkstr = Regex.Replace(wkstr, @"{![.*?]}", @"{!$1}");
wkstr = wkstr.Replace("{}", ""); wkstr = wkstr.Replace("{}", "");
wkstr = wkstr.Replace("ñ", "{!C0}"); wkstr = wkstr.Replace("ñ", "{!C0}");

View File

@ -695,7 +695,7 @@ namespace fmtxml
// replace the '<' with '{' & '>' with '}' // replace the '<' with '{' & '>' with '}'
pi.Token = pi.Token.Replace('<', '{'); pi.Token = pi.Token.Replace('<', '{');
pi.Token = pi.Token.Replace('>', '}'); pi.Token = pi.Token.Replace('>', '}');
pi.Token = pi.Token.Replace("REVDATE", "REV2");
cnt++; cnt++;
if (!isfirst) if (!isfirst)
{ {