W2L help content, hiding postponed features, some bugfixes

git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@64 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2010-05-17 07:42:33 +00:00
parent 83f0c7d224
commit 86e0b8d693
40 changed files with 885 additions and 142 deletions

View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.2 (2010-05-04)
* Version 1.2 (2010-05-13)
*
*/
@ -99,15 +99,25 @@ public class ListCounter {
}
public String getLabel() {
return getPrefix()+getLabelAndSuffix();
}
public String getPrefix() {
if (style.isNumber(nLevel)) {
String sPrefix = style.getLevelProperty(nLevel,XMLString.STYLE_NUM_PREFIX);
return sPrefix!=null ? sPrefix : "";
}
return "";
}
public String getLabelAndSuffix() {
if (style.isNumber(nLevel)) {
String sLabel="";
if (sNumFormat[nLevel]==null) return "";
int nLevels = Misc.getPosInteger(style.getLevelProperty(nLevel,
XMLString.TEXT_DISPLAY_LEVELS),1);
String sPrefix = style.getLevelProperty(nLevel,XMLString.STYLE_NUM_PREFIX);
String sSuffix = style.getLevelProperty(nLevel,XMLString.STYLE_NUM_SUFFIX);
String sSpace = "nothing".equals(style.getLevelStyleProperty(nLevel, XMLString.TEXT_LABEL_FOLLOWED_BY)) ? "" : " ";
String sLabel="";
if (sPrefix!=null) { sLabel+=sPrefix; }
for (int j=nLevel-nLevels+1; j<nLevel; j++) {
sLabel+=formatNumber(nCounter[j],sNumFormat[j],true)+".";
}
@ -122,7 +132,7 @@ public class ListCounter {
}
else {
return "";
}
}
}
// Utility method to generate number