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

Added column count

Browse source
This commit is contained in:
Georgy Litvinov 2020-01-22 16:42:14 +01:00
parent aee06864b8
commit 5bb29b8b6c
5 changed files with 56 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/writer2latex/office/StyleWithProperties.java
View file

@ -138,8 +138,8 @@ public class StyleWithProperties extends OfficeStyle {
backgroundImageProperties.loadFromDOM(child);
}
else if (XMLString.STYLE_COLUMNS.equals(sName)) {
nColCount = Misc.getPosInteger(Misc.getAttribute(child,
XMLString.FO_COLUMN_COUNT),1);
nColCount = Misc.getPosInteger(Misc.getAttribute(child, XMLString.FO_COLUMN_COUNT),1);
// TODO: read individual columns
}
else if (XMLString.STYLE_FOOTNOTE_SEP.equals(sName)) {

6
src/main/java/writer2latex/xhtml/DocumentSeparator.java
View file

@ -321,7 +321,7 @@ public class DocumentSeparator {
Element container = converter.createElement("div");
container.setAttribute("class", "pageContainer");
if (pageContainerStyle != null) {
System.out.println(pageContainerStyle);
//System.out.println(pageContainerStyle);
container.setAttribute("style", pageContainerStyle);
}
hnode.appendChild(container);
@ -345,5 +345,9 @@ public class DocumentSeparator {
return comment;
}
public String getPageContainerStyle() {
return this.pageContainerStyle;
}
}

11
src/main/java/writer2latex/xhtml/FrameStyleConverter.java
View file

@ -133,9 +133,16 @@ public class FrameStyleConverter extends StyleWithPropertiesConverterHelper {
cssBorder(style,props,bInherit);
cssPadding(style,props,bInherit);
cssBackground(style,props,bInherit);
}
cssColumns(style,props,bInherit);
}
public void cssMargins(StyleWithProperties style, CSVList props, boolean bInherit){
private void cssColumns(StyleWithProperties style, CSVList props, boolean bInherit) {
String columnCount = style.getAbsoluteProperty(XMLString.FO_COLUMN_COUNT);
System.out.println("columnCount " + columnCount);
//System.out.println(style.);
}
public void cssMargins(StyleWithProperties style, CSVList props, boolean bInherit){
// *Absolute* values fit with css
String s;
if (bInherit || style.getProperty(XMLString.FO_MARGIN_LEFT,false)!=null) {

14
src/main/java/writer2latex/xhtml/NoteConverter.java
View file

@ -93,7 +93,10 @@ class NoteConverter extends ConverterHelper {
noteList = new ArrayList<Node>();
notes.put(section, noteList);
}
noteList.add(onode);
noteList.add(onode);
System.out.println("add note to section " + section + " notelist size is " + noteList.size());
}
boolean hasNotes() {
@ -133,6 +136,15 @@ class NoteConverter extends ConverterHelper {
public void flushNotes(Node hnode, String sEpubType, String section) {
List<Node> noteList = notes.get(section);
if (noteList == null) {
//System.out.println("noteList is null");
//System.out.println("notes " + notes.size());
/*for (StackTraceElement ste : Thread.currentThread().getStackTrace()) {
System.out.println(ste);
}*/
return;
}
int nSize = noteList.size();
for (int i=0; i<nSize; i++) {
Node note = noteList.get(i);

44
src/main/java/writer2latex/xhtml/TextConverter.java
View file

@ -32,6 +32,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Element;
import writer2latex.util.CSVList;
import writer2latex.util.Misc;
import writer2latex.office.FontDeclaration;
import writer2latex.office.MasterPage;
@ -547,29 +548,38 @@ public class TextConverter extends ConverterHelper {
/* Process a text:section tag (returns current html node) */
private Node handleSection(Node onode, Node hnode) {
// Unlike headings, paragraphs and spans, text:display is not attached to the style:
Node result = null;
String lastSection = currentSection;
String sectionName = Misc.getAttribute(onode,TEXT_NAME);
String savedStyle = docSep.getPageContainerStyle();
if (!bDisplayHiddenText && "none".equals(Misc.getAttribute(onode,TEXT_DISPLAY))) { return hnode; }
hnode = docSep.closePage(hnode);
String sectionName = Misc.getAttribute(onode,TEXT_NAME);
String sStyleName = Misc.getAttribute(onode,TEXT_STYLE_NAME);
StyleInfo sectionInfo = new StyleInfo();
getSectionSc().applyStyle(sStyleName, sectionInfo);
docSep.setPageContainerStyle(sectionInfo.props.toString());
currentSection = sectionName;
setSectionStyle(onode);
hnode = docSep.openPage(hnode, pageNum);
/* hnode.appendChild(div);
converter.addTarget(div, sectionName + "|region");
applyStyle(sectionInfo, div);
sections.push(onode);
*/
hnode = traverseBlockText(onode, hnode);
/*
sections.pop();
*/
System.out.println("sectionname " + sectionName);
insertEndnotes((Element) hnode, sectionName);
currentSection = lastSection;
docSep.setPageContainerStyle(savedStyle);
return hnode;
}
private void setSectionStyle(Node onode) {
StyleWithProperties sectionStyle;
String sStyleName = Misc.getAttribute(onode,TEXT_STYLE_NAME);
OfficeStyle ofStyle = getSectionSc().getStyles().getStyle(sStyleName);
if (ofStyle != null) {
sectionStyle = (StyleWithProperties) ofStyle;
int colCount = sectionStyle.getColCount();
if (colCount > 1 ) {
String styleValue = "column-count: " + colCount + ";";
docSep.setPageContainerStyle(styleValue);
}
}
}
private void handleHeading(Element onode, Element hnode, boolean bAfterSplit) {
int nListLevel = getOutlineLevel((Element)onode);