C2024-017 Removed old (not implemented) format variables and settings from the format files and removed incomplete references to them in the C# code. Also added descriptions of the used format variables in the C# code that hooks the XML format files to the PROMS C# logic.

This commit is contained in:
2024-07-26 14:54:11 -04:00
parent 112edd1c8a
commit 7f899175d1
308 changed files with 1758 additions and 2539 deletions

View File

@@ -3179,7 +3179,7 @@ namespace Volian.Print.Library
// C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet.
// B2021-085 & 087: crash if noBullet was null. Also, if null, see if text in parent. if no text, replace the
// "%s." with noBullet (null) which won't put out just a '.' as step number.
if (MyItemInfo.MyDocStyle.Continue.Top.RemoveBullet)
if (MyItemInfo.MyDocStyle.Continue.Bottom.RemoveBullet)
{
if (tmp == null && MyItemInfo.IsCautionOrNotePart) tmp = MyItemInfo.MyParent.CombinedTab;
if (tmp != null)
@@ -7047,19 +7047,6 @@ namespace Volian.Print.Library
if (formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffHeaderInPagelist) return true;
return false;
}
// Currently not used.
//
//private bool UseCheckOffsDocStyle(int oldToNew, FormatInfo formatInfo)
//{
// int bit, retval=0;
// int mask=1;
// for(bit=0; bit < 32; bit++){
// if ((oldToNew & mask) != 0 && ((int)formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.UseCheckOffsIn & mask) !=0) retval = 1;
// mask <<= 1;
// }
// return retval > 0;
//}
}
/// <summary>

View File

@@ -192,26 +192,7 @@ namespace Volian.Print.Library
}
public float GetParagraphHeight(PdfContentByte cb, Paragraph iParagraph, string suffix, float width, bool throwException)
{
VlnSvgPageHelper ph = null;
if(cb != null) ph = cb.PdfWriter.PageEvent as VlnSvgPageHelper;
float heightAll = GetHeight(cb, iParagraph, suffix, width, throwException);
if (ph != null && ph.MyPromsPrinter.DebugOutput && !MyPageHelper.Back32BitPROMS)
{
vlnParagraph myParagraph = this as vlnParagraph;
if (myParagraph != null)
{
//if (myParagraph.MyItemInfo.FormatStepData != null && myParagraph.MyItemInfo.FormatStepData.Font.Family == "Prestige Elite Tall")
//if (!myParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.WrapSameAsEdit)
//{
// Chunk chk = RemoveLastCharacter(iParagraph);
// float heightAllButOne = GetHeight(cb, iParagraph, width, throwException);
// if (heightAll != heightAllButOne)
// return heightAllButOne;
// if (chk != null)
// RestoreLastCharacter(iParagraph, chk);
//}
}
}
return heightAll;
}
private static void RestoreLastCharacter(Paragraph iParagraph, Chunk chk)