fix: Add space before bullet list if set in settings
This commit is contained in:
parent
8b676491fe
commit
334c569332
1 changed files with 16 additions and 8 deletions
|
@ -111,13 +111,13 @@ public class ListCounter {
|
|||
}
|
||||
|
||||
public String getLabelAndSuffix() {
|
||||
String sLabel="";
|
||||
if (style != null && style.isNumber(nLevel)) {
|
||||
String sLabel="";
|
||||
if (sNumFormat[nLevel]==null) return "";
|
||||
int nLevels = Misc.getPosInteger(style.getLevelProperty(nLevel,
|
||||
XMLString.TEXT_DISPLAY_LEVELS),1);
|
||||
String sSuffix = style.getLevelProperty(nLevel,XMLString.STYLE_NUM_SUFFIX);
|
||||
String sSpace = "nothing".equals(style.getLevelStyleProperty(nLevel, XMLString.TEXT_LABEL_FOLLOWED_BY)) ? "" : " ";
|
||||
String sSuffix = getSuffix();
|
||||
String sSpace = getSpace();
|
||||
for (int j=nLevel-nLevels+1; j<nLevel; j++) {
|
||||
sLabel+=formatNumber(nCounter[j],sNumFormat[j],true)+".";
|
||||
}
|
||||
|
@ -125,15 +125,23 @@ public class ListCounter {
|
|||
sLabel+=formatNumber(nCounter[nLevel],sNumFormat[nLevel],true);
|
||||
if (sSuffix!=null) { sLabel+=sSuffix; }
|
||||
if (sLabel.length()>0 && sSpace!=null) { sLabel+=sSpace; }
|
||||
return sLabel;
|
||||
}
|
||||
else if (style != null && style.isBullet(nLevel)) {
|
||||
return style.getLevelProperty(nLevel,XMLString.TEXT_BULLET_CHAR);
|
||||
sLabel = style.getLevelProperty(nLevel,XMLString.TEXT_BULLET_CHAR);
|
||||
String sSpace = getSpace();
|
||||
if (sLabel.length()>0 && sSpace!=null) { sLabel+=sSpace; }
|
||||
}
|
||||
else {
|
||||
return "";
|
||||
}
|
||||
|
||||
return sLabel;
|
||||
}
|
||||
|
||||
private String getSpace() {
|
||||
return "nothing".equals(style.getLevelStyleProperty(nLevel, XMLString.TEXT_LABEL_FOLLOWED_BY)) ? "" : " ";
|
||||
}
|
||||
|
||||
private String getSuffix() {
|
||||
return style.getLevelProperty(nLevel,XMLString.STYLE_NUM_SUFFIX);
|
||||
}
|
||||
|
||||
// Utility method to generate number
|
||||
private String formatNumber(int number,String sStyle,boolean bLetterSync) {
|
||||
|
|
Loading…
Add table
Reference in a new issue