litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

fix: imitate list numberings instead of using standard list styles

Browse source
This commit is contained in:
Georgy Litvinov 2021-10-15 19:55:07 +02:00
parent f88a4a17a4
commit 8b676491fe
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/w2phtml/xhtml/XhtmlConfig.java
View file

@ -209,7 +209,7 @@ public class XhtmlConfig extends w2phtml.base.ConfigBase {
else { nValue = ABSOLUTE; } else { nValue = ABSOLUTE; }
} }
}; };
options[LIST_FORMATTING] = new IntegerOption("list_formatting","css1_hack") { options[LIST_FORMATTING] = new IntegerOption("list_formatting","hard_labels") {
@Override public void setString(String sValue) { @Override public void setString(String sValue) {
super.setString(sValue); super.setString(sValue);
if ("css1_hack".equals(sValue)) { nValue = CSS1_HACK; } if ("css1_hack".equals(sValue)) { nValue = CSS1_HACK; }

9
src/main/java/w2phtml/xhtml/content/ListParser.java
View file

@ -63,8 +63,8 @@ public class ListParser extends Parser {
} }
} }
protected void insertListLabel(ListStyle style, int nLevel, String sDefaultStyle, String sPrefix, String sLabel, Element hnode) { protected void insertListLabel(ListStyle style, String sDefaultStyle, String sPrefix, Element hnode) {
if (sLabel!=null && sLabel.length()>0) { if (sCurrentListLabel!=null && sCurrentListLabel.length()>0) {
if (sPrefix!=null) { if (sPrefix!=null) {
Element prefix = converter.createElement("span"); Element prefix = converter.createElement("span");
prefix.setAttribute("class", "chapter-name"); prefix.setAttribute("class", "chapter-name");
@ -73,7 +73,7 @@ public class ListParser extends Parser {
} }
StyleInfo info = new StyleInfo(); StyleInfo info = new StyleInfo();
if (style!=null) { if (style!=null) {
String sTextStyleName = style.getLevelProperty(nLevel,TEXT_STYLE_NAME); String sTextStyleName = style.getLevelProperty(nCurrentListLevel,TEXT_STYLE_NAME);
getTextSP().readStyle(sTextStyleName, info); getTextSP().readStyle(sTextStyleName, info);
} }
@ -83,7 +83,8 @@ public class ListParser extends Parser {
Element content = converter.createElement(info.sTagName); Element content = converter.createElement(info.sTagName);
getTextSP().writeStyle(info, content); getTextSP().writeStyle(info, content);
hnode.appendChild(content); hnode.appendChild(content);
content.appendChild( converter.createTextNode(sLabel) ); content.appendChild( converter.createTextNode(sCurrentListLabel) );
sCurrentListLabel = "";
} }
} }

9
src/main/java/w2phtml/xhtml/content/TextParser.java
View file

@ -74,9 +74,7 @@ public class TextParser extends Parser {
Element[] currentHeading = new Element[7]; // Last headings (repeated when splitting) Element[] currentHeading = new Element[7]; // Last headings (repeated when splitting)
// Counters for generated numbers // Counters for generated numbers
private String sCurrentListLabel = null;
private ListStyle currentListStyle = null; private ListStyle currentListStyle = null;
private int nCurrentListLevel = 0;
public Separator docSep = null; public Separator docSep = null;
@ -602,7 +600,7 @@ public class TextParser extends Parser {
// Prepend numbering // Prepend numbering
if (!bUnNumbered) { if (!bUnNumbered) {
getListParser().insertListLabel(listStyle, nListLevel, "SectionNumber", null, sLabel, heading); getListParser().insertListLabel(listStyle, "SectionNumber", null, heading);
} }
// Add to toc // Add to toc
@ -667,21 +665,18 @@ public class TextParser extends Parser {
hnode.appendChild(temp.getFirstChild()); hnode.appendChild(temp.getFirstChild());
// Maybe add to toc // Maybe add to toc
tocParser.handleParagraph((Element)onode, par, sCurrentListLabel);
if (!isEmptyParagraph) { if (!isEmptyParagraph) {
par = createTextBackground(par, styleName); par = createTextBackground(par, styleName);
if (config.listFormatting()==XhtmlConfig.HARD_LABELS) { if (config.listFormatting()==XhtmlConfig.HARD_LABELS) {
getListParser().insertListLabel(currentListStyle, nCurrentListLevel, "ItemNumber", null, sCurrentListLabel, par); getListParser().insertListLabel(currentListStyle, "ItemNumber", null, par);
} }
sCurrentListLabel = null;
traverseInlineText(onode,par); traverseInlineText(onode,par);
} }
else { else {
// An empty paragraph (this includes paragraphs that only contains // An empty paragraph (this includes paragraphs that only contains
// whitespace) is ignored by the browser, hence we add   // whitespace) is ignored by the browser, hence we add  
par.appendChild( converter.createTextNode("\u00A0") ); par.appendChild( converter.createTextNode("\u00A0") );
sCurrentListLabel = null;
} }
if (converter.isOPS() && !par.hasChildNodes()) { if (converter.isOPS() && !par.hasChildNodes()) {