From a45c860de4b63fb32de5e42bc2651180088568f5 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 31 Oct 2014 19:03:24 +0000 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20underline=20=E2=80=9C(Continued?= =?UTF-8?q?)=E2=80=9D=20in=20the=20top=20section=20continue=20message=20Fi?= =?UTF-8?q?xed=20the=20creation=20of=20the=20section=20continued=20message?= =?UTF-8?q?=20tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/BGEOIall.xml | Bin 139146 -> 139382 bytes PROMS/Formats/fmtall/BGESTPall.xml | Bin 148776 -> 149248 bytes PROMS/Volian.Print.Library/vlnParagraph.cs | 27 +++++++++++++++------ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/PROMS/Formats/fmtall/BGEOIall.xml b/PROMS/Formats/fmtall/BGEOIall.xml index 7cdf15591ff987c3cde19165a86c19a7468d6958..2673a56222e3bc382e1d64c37d46f1070797320f 100644 GIT binary patch delta 167 zcmeC$&++X5N5dAzDK91q$Z<@r6XTkEK$^=?fx(fX00>hV@)%MWLKyOaIFq4-AqOa8 u%b>&%!%zxj=K;m@fFcSE3e)e)GD%NQs$&$|KH~-B8ZoMw=JB7=NdW+#Rw`%! delta 26 icmex%fTL?aN5dAzDKDlPFm2m@;3eZP(X9qdZVCXgvJ3kF diff --git a/PROMS/Formats/fmtall/BGESTPall.xml b/PROMS/Formats/fmtall/BGESTPall.xml index 55f9cd23ee0cfc0e097baea8a2727ad73c2c086c..c2ba6bb7fdc6df24f7371d55d57f755e3f1ab770 100644 GIT binary patch delta 330 zcmZ3{#o5ru+0eqcg=q)tcpgwhfk9z9BP)~ibRkKms_7@JnE19Eu`!uZ%g7_s6$F?Rw%hSA XJ>sE)E4Kq(xs7UW+g>Nnv`Q5KN>4`= delta 76 zcmZqZ<6P0j+0eqcg=q)t^aTn`Inx)|F!60)!Nz0;=5L$MBgmvMosW@8XmSDv+jKQX brbF9V_?S3&K&rQGw~%J~#Iha8Oi%*=nq?No diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 1736a965..9d9cee89 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -961,14 +961,27 @@ namespace Volian.Print.Library if (!itemInfo.IsHigh && !itemInfo.IsSequential && !itemInfo.IsSection) itemInfo = itemInfo.ActiveParent as ItemInfo; string prTab = ""; string thisTab = itemInfo.MyTab.CleanText.Trim(); - - ItemInfo mypar = itemInfo.MyParent; - while (mypar.MyParent != null && !mypar.MyParent.IsProcedure) + if (!itemInfo.IsSection) { - string pTab = mypar.MyTab.CleanText.Trim(); - pTab = pTab.TrimEnd(" .".ToCharArray()) + "."; - prTab = pTab + prTab; - mypar = mypar.MyParent; + ItemInfo mypar = itemInfo.MyParent; + while (mypar != null && !mypar.IsProcedure) + { + string pTab = mypar.MyTab.CleanText.Trim(); + if (char.IsLetterOrDigit(pTab[0])) + { + pTab = pTab.TrimEnd(" .".ToCharArray()) + "."; + prTab = pTab + prTab; + } + else + { + // There' a bullet or some other graphics character. + // clear out the tab we are building so the we can build + // a continue tab up to this bullet or graphic character. + prTab = ""; + thisTab = ""; + } + mypar = (mypar.IsSection)? null: mypar.MyParent; + } } return (prTab + thisTab.Trim()).TrimEnd(".".ToCharArray()); }