added NSP specific, removed IdentWid’s

removed IdentWid’s, added TabBullet
setup DocStyle to inherit from the section’s default, not Base, added Plant specific for PageStyles (pagelist)
This commit is contained in:
2012-06-18 20:21:26 +00:00
parent 0e9a7efdae
commit f41b211187
3 changed files with 265 additions and 26 deletions

View File

@@ -485,7 +485,7 @@ internal class VE_FontConverter:ExpandableObjectConverter
///////////////////////////
namespace fmtxml
{
public class FmtToXml
public partial class FmtToXml
{
private BinaryReader brFmt;
private string fmtName;
@@ -737,6 +737,7 @@ namespace fmtxml
if (didNewPageStyle) pgs[numpgstyles] = AddPageStyles(fname);
brFmt.Close();
DoPSFontInherit(ref pgstyles);
AddPlantSpecific(fname, ref pgstyles);
// First serialize files based on the above - then use xsl to transform
// into prefered xml.
@@ -933,7 +934,7 @@ namespace fmtxml
{
fmtFileName = MyPath + @"\" + fname.Substring(0, fname.IndexOf(".")) + ".FMT";
}
if (fname == "CPL.Y01") Console.WriteLine(fname);
//if (fname == "CPL.Y01") Console.WriteLine(fname);
brFmt = new BinaryReader(File.Open(fnm,System.IO.FileMode.Open,System.IO.FileAccess.ReadWrite,FileShare.ReadWrite));
dcstyles.Name = GetAsciiString(brFmt);
bool didNewDocStyle = false;
@@ -1346,7 +1347,9 @@ namespace fmtxml
CompareFonts(DefPlantFont, ref docstyles.DcStyles[i].ContStyle);
CompareFonts(DefBaseFont, ref docstyles.DcStyles[i].ContStyle);
CompareFonts(DefPlantFont, ref docstyles.DcStyles[i].dstyle);
CompareFonts(DefBaseFont, ref docstyles.DcStyles[i].dstyle);
// The default font for the DocStyle only inherit from the Plant Format not from Base format
// This allows pagelist items to inherit from the section's default font setting when printing.
//CompareFonts(DefBaseFont, ref docstyles.DcStyles[i].dstyle);
}
}
private bool GetPlantBaseDefaultFonts()