This commit is contained in:
@@ -485,7 +485,7 @@ namespace fmtxml
|
||||
{
|
||||
MyPath = path;
|
||||
fmtName = nm;
|
||||
//if (!fmtName.ToUpper().StartsWith("NSP") && fmtName.ToUpper() != "BASE") return;
|
||||
//if (!fmtName.ToUpper().StartsWith("RGESMPE") && fmtName.ToUpper() != "BASE") return;
|
||||
try
|
||||
{
|
||||
// get the default base & plant files to use when figuring out inheritance.
|
||||
@@ -520,7 +520,7 @@ namespace fmtxml
|
||||
}
|
||||
private float ColToPoints(float f, uint style)
|
||||
{
|
||||
return 72 * (f / CvtFont.CvtFont.GetCPIs(style));
|
||||
return 72 * (f / CvtFont.CvtFont.GetCPISBadPICA12(style));
|
||||
}
|
||||
private string GetAsciiStringUntilNull(BinaryReader br)
|
||||
{
|
||||
@@ -1155,6 +1155,7 @@ namespace fmtxml
|
||||
if (parFont.FontFamily == subFont.FontFamily) subFont.FontFamily = null;
|
||||
if (parFont.FontSize == subFont.FontSize) subFont.FontSize = null;
|
||||
if (parFont.FontStyle == subFont.FontStyle) subFont.FontStyle = null;
|
||||
if (parFont.CPI == subFont.CPI) subFont.CPI = null;
|
||||
}
|
||||
}
|
||||
private void DoPSFontInherit(ref PageStyles pagstyles)
|
||||
|
@@ -81,6 +81,11 @@
|
||||
<xsl:value-of select="FontStyle"/>
|
||||
</xsl:attribute>
|
||||
</xsl:if>
|
||||
<xsl:if test="CPI">
|
||||
<xsl:attribute name="CPI">
|
||||
<xsl:value-of select="CPI"/>
|
||||
</xsl:attribute>
|
||||
</xsl:if>
|
||||
</Font>
|
||||
</xsl:if>
|
||||
</xsl:template>
|
||||
|
@@ -50,6 +50,11 @@
|
||||
<xsl:value-of select="./FontStyle"/>
|
||||
</xsl:attribute>
|
||||
</xsl:if>
|
||||
<xsl:if test="string-length(./CPI)">
|
||||
<xsl:attribute name="CPI">
|
||||
<xsl:value-of select="./CPI"/>
|
||||
</xsl:attribute>
|
||||
</xsl:if>
|
||||
</Font>
|
||||
</xsl:if>
|
||||
</xsl:template>
|
||||
|
Reference in New Issue
Block a user